diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh
index a52e72d0dc..d56a833452 100755
--- a/packaging/win32/dist.sh
+++ b/packaging/win32/dist.sh
@@ -183,7 +183,7 @@ function dist_gnucash() {
     cp -a $_INSTALL_UDIR/lib/gnucash/lib*.dll $DIST_UDIR/lib/gnucash
     cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
     mkdir -p $DIST_UDIR/share
-    cp -a $_INSTALL_UDIR/share/{gnucash,locale,pixmaps,xml} $DIST_UDIR/share
+    cp -a $_INSTALL_UDIR/share/{gnucash,locale,xml} $DIST_UDIR/share
     cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.bat $DIST_UDIR/bin
 
     _QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' `
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 44fd4e1ccd..5e2ead7af6 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -39,25 +39,25 @@ gncpixmap_DATA = \
 gncnormalicondir = ${datadir}/icons/hicolor/48x48/apps
 gncnormalicon_DATA = 48x48/gnucash-icon.png
 48x48/gnucash-icon.png: gnucash-icon-48x48.png
-	-mkdir 48x48
-	cp gnucash-icon-48x48.png 48x48/gnucash-icon.png
+	-mkdir -p 48x48
+	cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png
 
 gncmediumicondir = ${datadir}/icons/hicolor/32x32/apps
 gncmediumicon_DATA = 32x32/gnucash-icon.png
 32x32/gnucash-icon.png: gnucash-icon-32x32.png
-	-mkdir 32x32
-	cp gnucash-icon-32x32.png 32x32/gnucash-icon.png
+	-mkdir -p 32x32
+	cp ${srcdir}/gnucash-icon-32x32.png 32x32/gnucash-icon.png
 
 gncsmallicondir = ${datadir}/icons/hicolor/16x16/apps
 gncsmallicon_DATA = 16x16/gnucash-icon.png
 16x16/gnucash-icon.png: gnucash-icon-16x16.png
-	-mkdir 16x16
-	cp gnucash-icon-16x16.png 16x16/gnucash-icon.png
+	-mkdir -p 16x16
+	cp ${srcdir}/gnucash-icon-16x16.png 16x16/gnucash-icon.png
 
 gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
 gncscalableicon_DATA = scalable/gnucash-icon.svg
 scalable/gnucash-icon.svg: ${top_srcdir}/art/icon.svgz
-	-mkdir scalable
+	-mkdir -p scalable
 	gzip -cd ${top_srcdir}/art/icon.svgz > scalable/gnucash-icon.svg
 
 # As suggested by <http://live.gnome.org/GnomeGoals/AppIcon>