diff --git a/.circleci/config.yml b/.circleci/config.yml
index e09beb18..02c78de2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,7 +35,7 @@ commands:
           working_directory: build
       - run:
           name: Build RPM
-          command: rpmbuild -ba ../dist/rpm/strawberry.spec
+          command: rpmbuild -ba ../dist/unix/strawberry.spec
           working_directory: build
 
 
diff --git a/cmake/Rpm.cmake b/cmake/Rpm.cmake
index 4ddc9b98..032b61c0 100644
--- a/cmake/Rpm.cmake
+++ b/cmake/Rpm.cmake
@@ -57,12 +57,12 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
       set(RPM_DISTRO ${DIST_NAME} CACHE STRING "Suffix of the rpm file")
     endif()
     message(STATUS "RPM Suffix: ${RPM_DISTRO}")
-    configure_file(${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec.in ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec @ONLY)
+    configure_file(${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec.in ${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec @ONLY)
     add_custom_target(rpm
       COMMAND ${CMAKE_SOURCE_DIR}/dist/scripts/maketarball.sh
       COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/
-      COMMAND ${RPMBUILD_EXEC} -bs ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec
-      COMMAND ${RPMBUILD_EXEC} -bb ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec
+      COMMAND ${RPMBUILD_EXEC} -bs ${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec
+      COMMAND ${RPMBUILD_EXEC} -bb ${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec
     )
   endif()
 endif()
diff --git a/debian/rules b/debian/rules
index 32bf3aa7..0614bd48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,8 @@
 override_dh_auto_clean:
 	rm -f dist/macos/Info.plist
 	rm -f dist/macos/create-dmg.sh
-	rm -f dist/pacman/PKGBUILD
-	rm -f dist/rpm/strawberry.spec
+	rm -f dist/unix/PKGBUILD
+	rm -f dist/unix/strawberry.spec
 	rm -f dist/scripts/maketarball.sh
 	rm -f dist/windows/strawberry.nsi
 	rm -f src/translations/translations.pot
diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
index 83e78350..c2ddd7a9 100644
--- a/dist/CMakeLists.txt
+++ b/dist/CMakeLists.txt
@@ -1,5 +1,5 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD @ONLY)
 
 if (APPLE)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
@@ -16,7 +16,7 @@ if (UNIX AND NOT APPLE)
   install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
   install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
   install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
-  install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1)
+  install(FILES unix/strawberry.1 unix/strawberry-tagreader.1 DESTINATION share/man/man1)
 endif (UNIX AND NOT APPLE)
 
 if (APPLE)
diff --git a/dist/scripts/maketarball.sh.in b/dist/scripts/maketarball.sh.in
index 2c2add11..c78a0c7d 100755
--- a/dist/scripts/maketarball.sh.in
+++ b/dist/scripts/maketarball.sh.in
@@ -36,7 +36,7 @@ tar -cJf $name-$version.tar.xz \
     --exclude="$root/.zanata-cache" \
     --exclude="$root/debian/changelog" \
     --exclude="$root/dist/scripts/maketarball.sh" \
-    --exclude="$root/dist/pacman/PKGBUILD" \
+    --exclude="$root/dist/unix/PKGBUILD" \
     --exclude="$root/dist/macos/create-dmg.sh" \
     --exclude="$root/dist/macos/Info.plist" \
     --exclude="$root/dist/windows/windres.rc" \
diff --git a/dist/pacman/PKGBUILD.in b/dist/unix/PKGBUILD.in
similarity index 100%
rename from dist/pacman/PKGBUILD.in
rename to dist/unix/PKGBUILD.in
diff --git a/dist/man/strawberry-tagreader.1 b/dist/unix/strawberry-tagreader.1
similarity index 100%
rename from dist/man/strawberry-tagreader.1
rename to dist/unix/strawberry-tagreader.1
diff --git a/dist/man/strawberry.1 b/dist/unix/strawberry.1
similarity index 100%
rename from dist/man/strawberry.1
rename to dist/unix/strawberry.1
diff --git a/dist/rpm/strawberry.spec.in b/dist/unix/strawberry.spec.in
similarity index 100%
rename from dist/rpm/strawberry.spec.in
rename to dist/unix/strawberry.spec.in