diff --git a/CHANGELOG.md b/CHANGELOG.md
index 477f1efe..536519ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 3.10.0 (unreleased)
 - [PR #261](https://github.com/rqlite/rqlite/pull/261): Allow Raft Apply timeout to be configurable.
+- [PR #262](https://github.com/rqlite/rqlite/pull/262): Log GOOS and GOARCH at startup.
 
 ## 3.9.2 (January 14th 2017)
 - [PR #253](https://github.com/rqlite/rqlite/pull/254): Handle nil row returned by SQL execer. Fixes [issue #253](https://github.com/rqlite/rqlite/issues/253).
diff --git a/cmd/rqlited/main.go b/cmd/rqlited/main.go
index 27a54916..9623afd4 100644
--- a/cmd/rqlited/main.go
+++ b/cmd/rqlited/main.go
@@ -138,6 +138,7 @@ func main() {
 	log.SetFlags(log.LstdFlags)
 	log.SetPrefix("[rqlited] ")
 	log.Printf("rqlited starting, version %s, commit %s, branch %s", version, commit, branch)
+	log.Printf("architecture target is %s, operating system target is %s", runtime.GOARCH, runtime.GOOS)
 
 	// Start requested profiling.
 	startProfile(cpuProfile, memProfile)