diff --git a/Makefile.am b/Makefile.am
index 7a36bc59..4aa82871 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,32 +40,33 @@ ACLOCAL_AMFLAGS = -I m4
 DIST_SUBDIRS =           \
     src/libguac          \
 	src/guacd            \
-	src/protocols/vnc    \
 	src/protocols/rdp    \
+	src/protocols/spice  \
 	src/protocols/ssh    \
-	src/protocols/spice
+	src/protocols/vnc    \
+    tests
 
 SUBDIRS =       \
-    tests       \
     src/libguac \
-	src/guacd
-
-if ENABLE_VNC
-    SUBDIRS += src/protocols/vnc
-endif
+	src/guacd   \
+    tests
 
 if ENABLE_RDP
     SUBDIRS += src/protocols/rdp
 endif
 
-if ENABLE_SSH
-    SUBDIRS += src/protocols/ssh
-endif
-
 if ENABLE_SPICE
     SUBDIRS += src/protocols/spice
 endif
 
-EXTRA_DIST = LICENSE
+if ENABLE_SSH
+    SUBDIRS += src/protocols/ssh
+endif
+
+if ENABLE_VNC
+    SUBDIRS += src/protocols/vnc
+endif
+
+EXTRA_DIST = LICENSE doc/Doxyfile