diff --git a/Makefile.mak b/Makefile.mak
index 2b124ae4..8d82d5c7 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -1,8 +1,7 @@
 
-SUBDIRS = win32 src
+SUBDIRS = etc win32 src
 
 all::
 
 all depend install clean::
-	@for %i in ( $(SUBDIRS) ) do \
-        	@cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
+	@for %i in ( $(SUBDIRS) ) do @cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 9c388acd..ac9d0d26 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -15,6 +15,7 @@ opensc.conf: opensc.conf.in force
 .in:
 	sed \
 		-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
+		-e 's|@libdir[@]|$(libdir)|g' \
 		-e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
 		-e 's|@DEFAULT_SM_MODULE[@]|$(DEFAULT_SM_MODULE)|g' \
 		-e 's|@DEBUG_FILE[@]|$(DEBUG_FILE)|g' \
diff --git a/etc/Makefile.mak b/etc/Makefile.mak
index 2a6711bb..6bb36f92 100644
--- a/etc/Makefile.mak
+++ b/etc/Makefile.mak
@@ -1,8 +1,8 @@
-all: opensc.conf
+all: opensc.conf.win
 
-opensc.conf: opensc.conf.in
-	@copy /y opensc.conf.in opensc.conf
+opensc.conf.win: opensc.conf.in
+	@IF DEFINED USE_SED (sed.exe s/@DEBUG_FILE@/\%TEMP\%\\opensc-debug.log/;s/@DEFAULT_SM_MODULE@/smm-local.dll/ opensc.conf.in > opensc.conf.win) ELSE (copy /y opensc.conf.in opensc.conf.win)
 
 clean::
-	del /Q opensc.conf
+	del /Q opensc.conf.win