diff --git a/collector/loadavg_solaris.go b/collector/loadavg_solaris.go
new file mode 100644
index 00000000..97253ca0
--- /dev/null
+++ b/collector/loadavg_solaris.go
@@ -0,0 +1,40 @@
+// Copyright 2015 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build solaris
+// +build !noloadavg
+
+package collector
+
+import (
+	"errors"
+)
+
+/*
+// Define "__stack_chk_fail" and "__stack_chk_guard" symbols.
+#cgo LDFLAGS: -fno-stack-protector -lssp
+// Ensure "hrtime_t" is defined for sys/loadavg.h
+#include <sys/time.h>
+#include <sys/loadavg.h>
+*/
+import "C"
+
+func getLoad() ([]float64, error) {
+	var loadavg [3]C.double
+	samples := C.getloadavg(&loadavg[0], 3)
+	if samples > 0 {
+		return []float64{float64(loadavg[0]), float64(loadavg[1]), float64(loadavg[2])}, nil
+	} else {
+		return nil, errors.New("failed to get load average")
+	}
+}
diff --git a/collector/loadavg_unix.go b/collector/loadavg_unix.go
index 7641ceaf..4392611a 100644
--- a/collector/loadavg_unix.go
+++ b/collector/loadavg_unix.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin dragonfly netbsd openbsd solaris
+// +build darwin dragonfly netbsd openbsd
 // +build !noloadavg
 
 package collector