diff --git a/Makefile b/Makefile
index 684675d3..63a61d5f 100644
--- a/Makefile
+++ b/Makefile
@@ -52,12 +52,12 @@ MAN7DSTDIR=$(MANDIR)/man7
 MANTYPESRC=$(shell ls $(TYPEDIR)/*/man.text)
 
 # replace first path component
-MANTYPEPREFIX=$(subst $(TYPEDIR),$(MAN7DSTDIR)/cdist-type,$(MANTYPESRC)) 
+MANTYPEPREFIX=$(subst $(TYPEDIR)/,$(MAN7DSTDIR)/cdist-type,$(MANTYPESRC))
 
 # replace man.text with .7 or .html
 MANTYPEMAN=$(subst /man.text,.7,$(MANTYPEPREFIX)) 
 MANTYPEHTML=$(subst /man.text,.html,$(MANTYPEPREFIX))
-MANTYPEALL=$(TYPEMANPAGES) $(TYPEMANHTML)
+MANTYPEALL=$(MANTYPEMAN) $(MANTYPEHTML)
 
 # Link manpage so A2XH does not create man.html but correct named file
 $(MAN7DSTDIR)/cdist-type%.text: $(TYPEDIR)/%/man.text
diff --git a/docs/changelog b/docs/changelog
index a3ea62ab..e07f861c 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,11 +4,19 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+next:
+	* Build: Fixed several small issues in the Makefile
+	
+
 2.1.2: 2013-07-09
 	* Build: Change clean-dist target to "distclean"
+	* Build: Moved a lot of build logic into Makefile for dependency resolution
 	* Core: Make global explorers available to initial manifest (Arkaitz Jimenez)
 	* Core: Change execution order to run object as one unit
+	* Documentation: Improved documentation (Tomáš Pospíšek)
 	* New Remote Example: Add support for sudo operations (Chase James)
+	* New Type: __update_alternatives
+	* New Type: __cdist
 	* Type __apt_ppa: Fix comparison operator (Tyler Akins)
 	* Type __start_on_boot: Archlinux changed to use systemd - adapt type
 	* Type __git: Missing quotes added (Chase James)
@@ -16,10 +24,6 @@ Changelog
 	* Type __postgres_role: Make state parameter optional, fix password bug (Chase James)
 	* Type __process: Make state parameter optional
 	* Type __cron: Simplyfied and syntax change
-	* New Type: __update_alternatives
-	* New Type: __cdist
-	* Improved documentation (Tomáš Pospíšek)
-	* Moved a lot of build logic into Makefile for dependency resolution
 
 2.1.1: 2013-04-08
 	* Core: Use dynamic dependency resolver to allow indirect self dependencies