diff --git a/src/import-export/qif-import/Makefile.am b/src/import-export/qif-import/Makefile.am
index ed48bf4a19..5cefd8e8aa 100644
--- a/src/import-export/qif-import/Makefile.am
+++ b/src/import-export/qif-import/Makefile.am
@@ -89,17 +89,20 @@ endif
 noinst_DATA = .scm-links
 
 .scm-links: 
-	rm -f g-wrapped gnucash import-export qif-import
-	$(LN_S) -f . qif-import # to fix (load "qif-import/foo.scm")
-	$(LN_S) -f . import-export
-	$(LN_S) -f . gnucash 
-	$(LN_S) -f . g-wrapped 
+	$(RM) -rf gnucash
+	mkdir -p  gnucash qif-import
+	mkdir -p  gnucash/import-export
 if GNUCASH_SEPARATE_BUILDDIR
 	for X in ${SCM_FILE_LINKS} ; do \
 	  $(LN_S) -f ${srcdir}/$$X . ; \
 	done
 endif
+	( cd gnucash/import-export; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
+	( cd qif-import; for A in $(gncscm_DATA) ; do $(LN_S) -f ../$$A . ; done )
 	touch .scm-links
 
-CLEANFILES += qif-import import-export gnucash g-wrapped .scm-links
+clean-local:
+	$(RM) -rf gnucash qif-import
+
+CLEANFILES += .scm-links
 DISTCLEANFILES = ${SCM_FILE_LINKS}
diff --git a/src/import-export/qif-io-core/Makefile.am b/src/import-export/qif-io-core/Makefile.am
index 486cda24f4..2cf69076ae 100644
--- a/src/import-export/qif-io-core/Makefile.am
+++ b/src/import-export/qif-io-core/Makefile.am
@@ -25,18 +25,22 @@ SCM_FILE_LINKS = \
 endif
 
 .scm-links:
-	rm -f gnucash import-export 
-	$(LN_S) -f . gnucash
-	$(LN_S) -f . import-export
+	$(RM) -rf gnucash
+	mkdir -p  gnucash
+	mkdir -p  gnucash/import-export
 if GNUCASH_SEPARATE_BUILDDIR
 	for X in ${SCM_FILE_LINKS} ; do \
 	  $(LN_S) -f ${srcdir}/$$X . ; \
 	done
 endif
+	( cd gnucash/import-export; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
 	touch .scm-links
 
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/import-export/
 gncscmmod_DATA = qif-io-core.scm
 
-CLEANFILES = gnucash import-export .scm-links
+clean-local:
+	$(RM) -rf qif-import
+
+CLEANFILES = .scm-links
 DISTCLEANFILES = ${SCM_FILE_LINKS}