diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..fe554c7
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,22 @@
+servefile changelog
+===================
+
+2012-04-27 v0.4.0
+-----------------
+
+	0.4.0 released
+
+	* SSL capabilities
+	* Automatic creation of self signed certificates
+	* HTTP basic auth
+	* HEAD support
+	* POST/Multipart upload support
+	* PUT/POST upload support
+
+2012-04-05 v0.3.2
+-----------------
+	
+	0.3.2 released
+
+	* argparse
+
diff --git a/changelog b/changelog
deleted file mode 100644
index 45ec2b4..0000000
--- a/changelog
+++ /dev/null
@@ -1,16 +0,0 @@
-servefile changelog
-===================
-
-v0.4.0
-------
-* SSL capabilities
-* Automatic creation of self signed certificates
-* HTTP basic auth
-* HEAD support
-* POST/Multipart upload support
-* PUT/POST upload support
-
-v0.3.2
-------
-* argparse
-