diff --git a/src/Makefile b/src/Makefile
index 1996f9427..33bdea685 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,9 +3,10 @@ TARGETS = subdirs
 SUBDIRS = \
   common \
   eressea \
+  mapper
+
 #  askalon \
 #  tools \
-  mapper
 
 include Makefile.include
 
diff --git a/src/Makefile.include b/src/Makefile.include
index 7f77ff101..d915dae02 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -133,6 +133,8 @@ $(BUILD_DIR)/%.o:: %.c
 ## and only for old datafiles.
 ##
 
-#CFLAGS += -DCONVERT_TRIGGER
-#INCLUDES += -I. -I$(ERESSEA)/eressea/old
+ifeq ($(CONVERT_TRIGGERS), 1)
+ CFLAGS += -DCONVERT_TRIGGER
+ INCLUDES += -I. -I$(ERESSEA)/eressea/old
+endif
 
diff --git a/src/eressea/Makefile b/src/eressea/Makefile
index c78f10d57..3e27b02e8 100644
--- a/src/eressea/Makefile
+++ b/src/eressea/Makefile
@@ -15,9 +15,11 @@ OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
 ## conversion code for old triggers - should only be used for free eressea,
 ## and only for old datafiles.
 ##
-#SUBDIRS += old
-#LIBRARIES += $(PUBLISH_DIR)/libe-compat.a
-#LIBS += -le-compat
+ifeq ($(CONVERT_TRIGGERS), 1)
+ SUBDIRS += old
+ LIBRARIES += $(PUBLISH_DIR)/libe-compat.a
+ LIBS += -le-compat
+endif
 
 ##
 ## more definitions