diff --git a/CHANGELOG b/CHANGELOG
index 888beac..271e2ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,7 @@ iodine - http://code.kryo.se/iodine
 
 CHANGES:
 
-2010-02-13: 0.6.0-rc1 "Hotspotify"
+20xx-xx-xx: x.y.z "Hotspotify"
 	- Fixed tunnel not working on Windows.
 	- Any device name is now supported on Windows, fixes #47.
 	- Multiple installed TAP32 interfaces are now supported, fixes #46.
diff --git a/src/iodine.c b/src/iodine.c
index 03efb18..0d34c43 100644
--- a/src/iodine.c
+++ b/src/iodine.c
@@ -101,8 +101,12 @@ help() {
 
 static void
 version() {
+	char *svnver;
+
+	svnver = "$Rev$ from $Date$";
+
 	fprintf(stderr, "iodine IP over DNS tunneling client\n");
-	fprintf(stderr, "version: 0.6.0-rc1 from 2010-02-13\n");
+	fprintf(stderr, "SVN version: %s\n", svnver);
 
 	exit(0);
 }
diff --git a/src/iodined.c b/src/iodined.c
index 3681084..84b2281 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -2164,8 +2164,10 @@ help() {
 
 static void
 version() {
+	char *svnver;
+	svnver = "$Rev$ from $Date$";
 	fprintf(stderr, "iodine IP over DNS tunneling server\n");
-	fprintf(stderr, "version: 0.6.0-rc1 from 2010-02-13\n");
+	fprintf(stderr, "SVN version: %s\n", svnver);
 	exit(0);
 }