diff --git a/Makefile.am b/Makefile.am
index a786308..933809f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@
 ## Makefile for Finnish--German
 ###############################################################################
 
-VERSION=0.0.0
 LANG1=fin
 LANG2=deu
 PREFIX1=$(LANG1)-$(LANG2)
@@ -14,7 +13,7 @@ TARGETS_COMMON = \
 	$(PREFIX1).automorf.hfst \
 	$(PREFIX1).rlx.bin \
 	$(PREFIX1).autobil.bin \
-		$(PREFIX1).autolex.bin \
+	$(PREFIX1).autolex.bin \
 	$(PREFIX1).autogen.bin \
 	$(PREFIX1).t1x.bin \
 	$(PREFIX1).t2x.bin \
@@ -23,9 +22,9 @@ TARGETS_COMMON = \
 	$(PREFIX2).rlx.bin \
 	$(PREFIX2).prep.cg3.bin \
 	$(PREFIX2).autobil.bin \
-		$(PREFIX2).autolex.bin \
+	$(PREFIX2).autolex.bin \
 	$(PREFIX2).autogen.hfst \
-    $(PREFIX2).t1x.bin \
+	$(PREFIX2).t1x.bin \
 	$(PREFIX2).t2x.bin \
 	$(PREFIX2).t3x.bin
 if CAN_LSX
@@ -34,7 +33,20 @@ endif
 
 
 # This include defines goals for install-modes, .deps/.d and .mode files:
-@ap_include@
+
+modes/fin-deu.mode: modes.xml
+	if ! test -d modes ; then \
+		$(MKDIR_P) modes/ ;\
+	fi
+	apertium-gen-modes $(srcdir)/modes.xml
+	mv -v fin-deu.mode $@
+
+modes/deu-fin.mode: modes.xml
+	if ! test -d modes ; then \
+		$(MKDIR_P) modes/ ;\
+	fi
+	apertium-gen-modes $(srcdir)/modes.xml
+	mv -v deu-fin.mode $@
 
 ###############################################################################
 ## Monolingual transducers
@@ -171,6 +183,7 @@ $(PREFIX2).autopgen.bin: $(AP_SRC1)/$(LANG1).autopgen.bin
 EXTRA_DIST= \
 		$(BASENAME).$(PREFIX1).lrx \
 		$(BASENAME).$(PREFIX1).dix \
+		$(BASENAME).$(PREFIX2).lsx \
 		$(BASENAME).$(PREFIX2).lrx \
 		$(BASENAME).$(PREFIX1).t1x \
 		$(BASENAME).$(PREFIX1).t2x \
@@ -178,6 +191,7 @@ EXTRA_DIST= \
 		$(BASENAME).$(PREFIX2).t1x \
 		$(BASENAME).$(PREFIX2).t2x \
 		$(BASENAME).$(PREFIX2).t3x \
+		$(BASENAME).$(PREFIX2).prep.cg3 \
 		modes.xml
 
 ###############################################################################
@@ -196,10 +210,9 @@ apertium_fin_deu_DATA= \
 	$(BASENAME).$(PREFIX2).t2x \
 	$(BASENAME).$(PREFIX2).t3x
 
-# All modes are created by the same goal, listing several will just give problems with make -j2
-noinst_DATA=modes/$(PREFIX1).mode
-
-install-data-local: install-modes
+apertium_fin_deu_modesdir=$(prefix)/share/apertium/modes/
+apertium_fin_deu_modes_DATA=modes/$(PREFIX1).mode \
+							modes/$(PREFIX2).mode
 
 ###############################################################################
 ## Cleanup
@@ -207,7 +220,7 @@ install-data-local: install-modes
 
 CLEANFILES = $(TARGETS_COMMON)
 clean-local:
-	-rm -rf .deps modes
+	-rm -rf .deps modes *.mode
 
 ###############################################################################
 ## Test
diff --git a/configure.ac b/configure.ac
index ef88239..689b394 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([apertium-fin-deu], [0.0.1], [flammie@iki.fi], [apertium-fin-deu], [http://wiki.apertium.org/wiki/apertium-fin-deu])
+AC_INIT([apertium-fin-deu], [0.0.2], [flammie@iki.fi], [apertium-fin-deu], [http://wiki.apertium.org/wiki/apertium-fin-deu])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 
 AC_PROG_LN_S
@@ -77,7 +77,5 @@ m4_ifdef([AP_CHECK_LING],[],[AC_MSG_ERROR([AP_CHECK_LING not defined, is apertiu
 AP_CHECK_LING([1], [apertium-fin])
 AP_CHECK_LING([2], [apertium-deu])
 
-AP_MKINCLUDE
-
 AC_OUTPUT([Makefile apertium-fin-deu.pc t/config.sh])