diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index ad2cd481..0384edef 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -49,22 +49,44 @@ FTP_PUB_DIR_ABS  = $(JANNET_PROJ_DIR)/$(PROJECT)
 PROFILE_DIR      = $(HOME)/.profile.d
 ROOTOWNER        = $(shell id -un)
 ROOTGROUP        = $(shell id -gn)
-IMAGEDIR         = $(TOPDIR)/../images
+IMAGEDIR         = $(MODDIR)/../images
+CTRLDIR          = $(HOME)/bin
 
-# -- debugging options
+
+# -- options
 
 # for using the dbmalloc lib, before you will need to do:
 # cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
-COMPILE_DEBUG_CODE    = true
-#USE_DBMALLOC         = true
-#USE_DMALLOC         = true
-#USE_MEMWATCH         = true
-#USE_EFENCE           = true
-#USE_MPATROL          = true
-#USE_VALGRIND          = true
-USE_COMPILER_DEBUG_OPTS = true
-#USE_TIMER             = true
-#LOG_THREAD_NAMES      = true
-#USE_COMPILER_OPTIMIZATION_OPTS = true
-#USE_TRACING           = true
-#STRIP_SYMBOLS          = true
+
+#USE_BTOOLS                     = true
+#USE_DSPFS                      = true
+
+#USE_ENGINE_BENNO               = true
+#USE_ENGINE_JAN                 = true
+
+#USE_JACK                       = true
+#USE_JACKDUMMY                  = true
+#USE_JACKJART                   = true
+#USE_JACKRTAI                   = true
+#USE_JACK                       = true
+
+#USE_DBMALLOC                   = true
+#USE_DMALLOC                    = true
+#USE_EFENCE                     = true
+#USE_VALGRIND                   = true
+#USE_MEMWATCH                   = true
+#USE_MPATROL                    = true
+#USE_PROFILER                   = true
+#USE_TRACING                    = true
+#USE_TIMER                      = true
+LOG_THREAD_NAMES               = true
+
+#STRIP_SYMBOLS                  = true
+COMPILE_DEBUG_CODE             = true
+USE_COMPILER_DEBUG_OPTS        = true
+USE_COMPILER_OPTIMIZATION_OPTS = true
+
+#USE_FUSE                       = true
+#USE_SNDFILE                    = true
+
+
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 1e687345..456c15eb 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -48,20 +48,43 @@ LIBTYPE          = shared
 PROFILE_DIR      = $(ENV_PREFIX)/etc/profile.d
 ROOTOWNER        = root
 ROOTGROUP        = root
+# dunno if this is cool, see defs-dev.mk
 IMAGEDIR         = $(TOPDIR)/images
+CTRLDIR          = /etc/rc.d
 
-# -- debugging options
+# -- options
 
 # for using the dbmalloc lib, before you will need to do:
 # cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
-#COMPILE_DEBUG_CODE    = true
-#USE_DBMALLOC         = true
-#USE_DMALLOC          = true
-#USE_MEMWATCH         = true
-#USE_EFENCE           = true
-#USE_MPATROL          = true
-USE_COMPILER_DEBUG_OPTS = true
-USE_COMPILER_OPTIMIZATION_OPTS = true
-#USE_TRACING           = true
-#USE_TIMER             = true
+
+#USE_BTOOLS                     = true
+#USE_DSPFS                      = true
+
+#USE_ENGINE_BENNO               = true
+#USE_ENGINE_JAN                 = true
+
+#USE_JACK                       = true
+#USE_JACKDUMMY                  = true
+#USE_JACKJART                   = true
+#USE_JACKRTAI                   = true
+#USE_JACK                       = true
+
+#USE_DBMALLOC                   = true
+#USE_DMALLOC                    = true
+#USE_EFENCE                     = true
+#USE_VALGRIND                   = true
+#USE_MEMWATCH                   = true
+#USE_MPATROL                    = true
+#USE_PROFILER                   = true
+#USE_TRACING                    = true
+#USE_TIMER                      = true
+#LOG_THREAD_NAMES               = true
+
+#STRIP_SYMBOLS                  = true
+COMPILE_DEBUG_CODE             = true
+USE_COMPILER_DEBUG_OPTS        = true
+USE_COMPILER_OPTIMIZATION_OPTS = true
+
+#USE_FUSE                       = true
+#USE_SNDFILE                    = true