diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..cc71214
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,30 @@
+# Freifunk München Firmware Changelog
+
+## snapshot~20141119
+ - fixed ipv4-prefix to /16 netmask
+ - changed gateways ips to domain-names
+ - changed `msg_pub_key` to automate entering the node-data to our key-form
+ - changed mesh-SSID from 02:0E:8E:1E:61:17 to mesh.ffm
+ - added `ntp_servers` '2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm'
+ - changed `site_code` back to ffmuc (instead of ffm)
+ - changed `hostname_prefix` to NULL
+ - changed `mesh_ssid` to mesh.ffmuc
+ - added public key from fpletz
+
+## 0.6~stable20141018
+ - changed ip address for gw02
+
+## 0.6~stable20141011
+ - gw04 hinzugefügt
+ - Text "Knoten hinzufügen" geändert
+ - Autoupdater auf "stable" als Standart-Wert gesetzt
+
+## 0.6~exp20141004
+ - Autoupdater hinzugefügt
+
+## 0.6~exp20140926
+ - Bugfixes
+ - gw02 hinzugefügt
+
+## 0.6~exp20140907
+ - initiale Version
diff --git a/site.conf b/site.conf
index 9f0ff70..c48e55c 100644
--- a/site.conf
+++ b/site.conf
@@ -1,52 +1,4 @@
 --[[	
-
-	******  Gluon site.conf ******
-	Current version: snapshot~20141119
-	Branch: stable
-	Author: Ole
-	Datum: 19.11.2014
-
-	recent bugfixes/changes for next generation firmware (to-be-enrolled shortly)
-
-
-
-	Changelog:
-
-	snapshot~20141119	19.11.2014	Ole
-        - fixed ipv4-prefix to /16 netmask (04.11.2014)
-        - changed gateways ips to domain-names
-        - changed msg_pub_key to automate entering the node-data to our key-form (01.11.2014)
-        - changed mesh-SSID from 02:0E:8E:1E:61:17 to mesh.ffm
-        - added ntp_servers '2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm' (18.11.2014)
-        - changed site_code back to ffmuc (instead of ffm) (18.11.2014)
-        - changed hostname_prefix to NULL (18.11.2014)
-        - changed mesh_ssid to mesh.ffmuc
-        - added public key from fpletz
-
-	0.6~stable20141018	18.10.2014	Ole
-	- changed ip address for gw02
-
-	0.6~stable20141011	11.10.2014	Ole
-	- gw04 hinzugefügt
-	- Text "Knoten hinzufügen" geändert
-	- Autoupdater auf "stable" als Standart-Wert gesetzt
-
-	0.6~exp20141004		04.10.2014	Ole
-	- Autoupdater hinzugefügt
-
-	0.6~exp20140926		26.09.2014	Ole
-	- Bugfixes
-	- gw02 hinzugefügt
-
-	0.6~exp20140907		07.09.2014	Ole
-	- initiale Version
-
-
-	******************************
-
-
-
-
 	gluon site.conf example
 
         This file contains the Munich freifunk site.conf which was adopted from the original freifunk suite used in Luebeck.