diff --git a/.gitignore b/.gitignore
index 44b9e6d00..13d08b87e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *.sh
 
 LICENSE.txt
-CHANGELOG
 
 temp/*
 runtime/*
diff --git a/changelog/0.5.5.txt b/changelog/0.5.5.txt
new file mode 100644
index 000000000..bcdca852f
--- /dev/null
+++ b/changelog/0.5.5.txt
@@ -0,0 +1,15 @@
+#0.5.5
+
+- Fixed warnings on startup about Thaumcraft compatibility
+- Fixed tundra boulder generation
+- Added bamboo thatching > bamboo recipe
+- Tweaked the Liquid Poison texture
+- Custom dyes now work on sheep and dog collars
+- Fixed a bug with connected textures
+- Updated some temperatures and humidities for Forestry
+- Added some new gems
+- Changed the Ancient Staff recipe to use the new gems
+- Fixed temperature/humidity values for the Hot Springs and Mountain biomes
+- Added config options for which Nether biomes generate
+- Added a config option for the custom loot
+- Fixed a bug with bamboo not decaying
\ No newline at end of file