diff --git a/pkg/mac/Info.plist b/Info.plist
similarity index 100%
rename from pkg/mac/Info.plist
rename to Info.plist
diff --git a/build/env.bat b/build/env.bat
new file mode 100644
index 00000000..f03f6e19
--- /dev/null
+++ b/build/env.bat
@@ -0,0 +1,6 @@
+CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" 
+set PATH=C:\qt\qtbase\bin;%PATH%
+set PATH=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;%PATH%
+set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.1\Include;%INCLUDE%
+set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib;%LIB%
+set CL=/D_USING_V110_SDK71_
diff --git a/build/env64.bat b/build/env64.bat
new file mode 100644
index 00000000..e43b1d38
--- /dev/null
+++ b/build/env64.bat
@@ -0,0 +1,6 @@
+CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 
+set PATH=C:\qt64\qtbase\bin;%PATH% 
+set PATH=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;%PATH%
+set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.1\Include;%INCLUDE%
+set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib\x64;%LIB%
+set CL=/D_USING_V110_SDK71_
diff --git a/gpxsee.pro b/gpxsee.pro
index 16b3b139..297eedba 100644
--- a/gpxsee.pro
+++ b/gpxsee.pro
@@ -68,5 +68,8 @@ SOURCES += src/main.cpp \
     src/app.cpp
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_cs.ts
-macx:ICON = icons/gpxsee.icns
+macx {
+    ICON = icons/gpxsee.icns
+    QMAKE_INFO_PLIST = Info.plist
+}
 win32:RC_FILE = gpxsee.rc
diff --git a/pkg/win/gpxsee.nsi b/pkg/gpxsee.nsi
similarity index 100%
rename from pkg/win/gpxsee.nsi
rename to pkg/gpxsee.nsi
diff --git a/pkg/win/gpxsee64.nsi b/pkg/gpxsee64.nsi
similarity index 100%
rename from pkg/win/gpxsee64.nsi
rename to pkg/gpxsee64.nsi
diff --git a/maps.txt b/pkg/maps.txt
similarity index 100%
rename from maps.txt
rename to pkg/maps.txt