diff --git a/etcd.go b/etcd.go
index 05720fb35..057b0b9b3 100644
--- a/etcd.go
+++ b/etcd.go
@@ -31,6 +31,8 @@ var (
 
 	force bool
 
+	printVersion bool
+
 	maxSize int
 
 	snapshot bool
@@ -45,6 +47,8 @@ var (
 )
 
 func init() {
+	flag.BoolVar(&printVersion, "version", false, "print the version and exit")
+
 	flag.BoolVar(&log.Verbose, "v", false, "verbose logging")
 	flag.BoolVar(&veryVerbose, "vv", false, "very verbose logging")
 
@@ -116,6 +120,11 @@ type Info struct {
 func main() {
 	flag.Parse()
 
+	if printVersion {
+		fmt.Println(releaseVersion)
+		os.Exit(0)
+	}
+
 	if cpuprofile != "" {
 		runCPUProfile()
 	}