16 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index d324a8247..29ce7d8c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,7 +91,7 @@ after_success:
           if [ "$TRAVIS_OS_NAME" == "osx" ]; then
               npm update -g npm
               npm install -g appdmg
-              appdmg -v dist/osx_dmg.json KVIrc.dmg
+              appdmg -v dist/osx/osx_dmg.json KVIrc.dmg
           fi
 
     # Only upload to kvirc.staticfox.net if this is a commit to master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0637ef27c..102347893 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1121,7 +1121,7 @@ subdirs(data doc po scripts src)
 
 #install additional resources for win32
 if(WIN32)
-	add_subdirectory(win32build)
+	add_subdirectory(dist/windows)
 endif()
 
 ###############################################################################
diff --git a/dist/background.jpg b/dist/osx/background.jpg
index 1cc1b5af1..1cc1b5af1 100644
--- a/dist/background.jpg
+++ b/dist/osx/background.jpg
diff --git a/dist/osx_dmg.json b/dist/osx/osx_dmg.json
index 519d256cd..4b07a28a8 100644
--- a/dist/osx_dmg.json
+++ b/dist/osx/osx_dmg.json
@@ -1,10 +1,10 @@
 {
   "title": "KVIrc",
-  "icon": "../data/icons/64x64/kvirc.png",
+  "icon": "../../data/icons/64x64/kvirc.png",
   "background": "background.jpg",
   "icon-size": 64,
   "contents": [
     { "x": 448, "y": 344, "type": "link", "path": "/Applications" },
-    { "x": 192, "y": 344, "type": "file", "path": "../build/KVIrc.app/" }
+    { "x": 192, "y": 344, "type": "file", "path": "../../build/KVIrc.app/" }
   ]
 }
 \ No newline at end of file
diff --git a/win32build/CMakeLists.txt b/dist/windows/CMakeLists.txt
index afe456101..12a0b53ba 100644
--- a/win32build/CMakeLists.txt
+++ b/dist/windows/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for win32build
+# CMakeLists for dist/windows
 
 subdirs(translations)
 
diff --git a/win32build/translations/CMakeLists.txt b/dist/windows/translations/CMakeLists.txt
index 4ed7f0d62..498980a4b 100644
--- a/win32build/translations/CMakeLists.txt
+++ b/dist/windows/translations/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for win32build/translations
+# CMakeLists for dist/windows/translations
 
 file(GLOB translations "${CMAKE_CURRENT_SOURCE_DIR}/*.nsi")
 
diff --git a/win32build/translations/belarusian.nsi b/dist/windows/translations/belarusian.nsi
index 96a80bd10..96a80bd10 100644
--- a/win32build/translations/belarusian.nsi
+++ b/dist/windows/translations/belarusian.nsi
diff --git a/win32build/translations/french.nsi b/dist/windows/translations/french.nsi
index 052cad7ee..052cad7ee 100644
--- a/win32build/translations/french.nsi
+++ b/dist/windows/translations/french.nsi
diff --git a/win32build/translations/german.nsi b/dist/windows/translations/german.nsi
index 625cbd4cc..625cbd4cc 100644
--- a/win32build/translations/german.nsi
+++ b/dist/windows/translations/german.nsi
diff --git a/win32build/translations/italian.nsi b/dist/windows/translations/italian.nsi
index b0a8a5f81..b0a8a5f81 100644
--- a/win32build/translations/italian.nsi
+++ b/dist/windows/translations/italian.nsi
diff --git a/win32build/translations/japanese.nsi b/dist/windows/translations/japanese.nsi
index 26b0a912d..26b0a912d 100644
--- a/win32build/translations/japanese.nsi
+++ b/dist/windows/translations/japanese.nsi
diff --git a/win32build/translations/russian.nsi b/dist/windows/translations/russian.nsi
index 15841361b..15841361b 100644
--- a/win32build/translations/russian.nsi
+++ b/dist/windows/translations/russian.nsi
diff --git a/win32build/translations/spanish.nsi b/dist/windows/translations/spanish.nsi
index 56b53837d..56b53837d 100644
--- a/win32build/translations/spanish.nsi
+++ b/dist/windows/translations/spanish.nsi
diff --git a/win32build/translations/ukrainian.nsi b/dist/windows/translations/ukrainian.nsi
index 856b99d61..856b99d61 100644
--- a/win32build/translations/ukrainian.nsi
+++ b/dist/windows/translations/ukrainian.nsi
diff --git a/doc/hackers.guide.txt b/doc/hackers.guide.txt
index 2f90fd892..e88bfd87b 100644
--- a/doc/hackers.guide.txt
+++ b/doc/hackers.guide.txt
@@ -290,7 +290,7 @@ The source tree
 |                         process to execute last-minute cleanup
 |
 |
-`-- win32build            The directory for Windows builds
+`-- dist/windows          The directory for Windows builds
 
 As of 2004.05.26:
 [pragma@phoenix src]# cat $(find ./ -name \*.h) | wc -l
diff --git a/po/README.translators b/po/README.translators
index 644256dbc..32dfe8ad0 100644
--- a/po/README.translators
+++ b/po/README.translators
@@ -11,5 +11,5 @@ the tips. As stated in that file, the translated file MUST be encoded
 in UTF-8.
 
 Please have also a look into the file for you language in
-../win32build/translations
+../dist/windows/translations
 NOTE: This files are NOT UTF-8.