diff --git a/etc/Makefile.am b/etc/Makefile.am
index 85e43072..910c2d1e 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,10 +1,12 @@
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-DISTCLEANFILES = opensc.conf
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/opensc.conf.win
+DISTCLEANFILES = opensc.conf opensc.conf.win
+
+EXTRA_DIST = Makefile.mak
 
 SUFFIXES = .in
 
-dist_noinst_DATA = opensc.conf.in
-nodist_noinst_DATA = opensc.conf	# For Windows MSVC build
+dist_noinst_DATA = opensc.conf.in opensc.conf.win.in
+nodist_noinst_DATA = opensc.conf opensc.conf.win # For Windows MSVC build
 
 # Make sure we build this every time
 # as there is no dependency for this.
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 1705fdbe..c42d7be6 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,8 +1,8 @@
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in \
-		$(srcdir)/versioninfo.rc $(srcdir)/winconfig.h
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc $(srcdir)/winconfig.h \
+		$(srcdir)/OpenSC.iss $(srcdir)/OpenSC.wxs $(srcdir)/OpenSC.ico $(srcdir)/license.rtf
 EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak opensc-install.bat \
 		versioninfo.rc.in winconfig.h.in OpenSC.iss.in OpenSC.wxs.in
-dist_noinst_HEADERS = versioninfo.rc winconfig.h
+dist_noinst_HEADERS = versioninfo.rc winconfig.h OpenSC.iss OpenSC.wxs license.rtf OpenSC.ico
 
 if WIN32
 sbin_SCRIPTS = opensc-install.bat
diff --git a/win32/winconfig.h.in b/win32/winconfig.h.in
index ed00c6a4..57a313e0 100644
--- a/win32/winconfig.h.in
+++ b/win32/winconfig.h.in
@@ -29,7 +29,7 @@
 
 #ifndef strnicmp
 #define strnicmp _strnicmp
-#endif 
+#endif
 
 #ifndef stricmp
 #define stricmp _stricmp
@@ -66,11 +66,11 @@
 #define F_OK  0		/* test whether exist.  */
 #endif
 
-#ifndef S_IRUSR 
+#ifndef S_IRUSR
 #define S_IRUSR S_IREAD
 #endif
 
-#ifndef S_IWUSR 
+#ifndef S_IWUSR
 #define S_IWUSR S_IWRITE
 #endif
 
@@ -79,7 +79,7 @@
 #define HAVE_WINSCARD_H
 #define DEFAULT_PCSC_PROVIDER "winscard.dll"
 
-#define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC\\profiles"
+#define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC Project\\OpenSC\\profiles"
 
 #define PATH_MAX FILENAME_MAX