diff --git a/marble.changes b/marble.changes
index 3c7cc25..0d82ca0 100644
--- a/marble.changes
+++ b/marble.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 19 11:09:31 UTC 2015 - cgiboudeaux@gmx.com
+
+- Add marble_fix_ppc64_build.patch. Fixes the ppc64 installation paths
+
 -------------------------------------------------------------------
 Fri Aug  7 07:04:33 UTC 2015 - tittiatcoke@gmail.com
 
diff --git a/marble.spec b/marble.spec
index 2442379..88c7170 100644
--- a/marble.spec
+++ b/marble.spec
@@ -24,6 +24,8 @@ Summary:        Generic map viewer
 License:        LGPL-2.1+
 Group:          Amusements/Teaching/Other
 Url:            http://edu.kde.org
+# PATCH-FIX-UPSTREAM marble_fix_ppc64_build.patch -- Don't expect LIB_SUFFIX to be set
+Patch0:         marble_fix_ppc64_build.patch
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  fdupes
 BuildRequires:  gpsd-devel
diff --git a/marble_fix_ppc64_build.patch b/marble_fix_ppc64_build.patch
new file mode 100644
index 0000000..0e973c2
--- /dev/null
+++ b/marble_fix_ppc64_build.patch
@@ -0,0 +1,63 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6278e93..7aec313 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,6 +7,10 @@ SET(CMAKE_COLOR_MAKEFILE ON)
+ 
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ 
++# Let CMake find the correct library dir instead of
++# relying on the obsolete LIB_SUFFIX parameter
++include(GNUInstallDirs)
++
+ # Taken from KDECompilerSettings.cmake:
+ # Pick sensible versions of the C and C++ standards.
+ # Note that MSVC does not have equivalent flags; the features are either
+@@ -193,11 +197,9 @@ set (ENABLE_TESTS FALSE CACHE BOOL "Build unit tests?")
+ set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer")
+ add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO")
+ 
+-# TODO: this could use GNUInstallDirs or ECM, so e.g. LIB_SUFFIX is automatically set
+-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+ set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX} CACHE PATH  "Base directory for executables and libraries" FORCE)
+ if (QT5BUILD)
+-   set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/plugins)
++   set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins)
+ endif()
+ 
+ ####################################################
+@@ -223,7 +225,7 @@ elseif(APPLE)
+       SET (plugin_dir   ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/plugins)
+ else() # Linux / bsd etc...
+       set(data_dir ${CMAKE_INSTALL_PREFIX}/share/marble/data)
+-      set(plugin_dir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/marble/plugins)
++      set(plugin_dir ${CMAKE_INSTALL_LIBDIR}/marble/plugins)
+       set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/marble/cmake)
+ endif()
+ 
+diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt
+index 677eb7d..dda65a7 100644
+--- a/src/lib/astro/CMakeLists.txt
++++ b/src/lib/astro/CMakeLists.txt
+@@ -48,7 +48,7 @@ if(WIN32)
+ elseif(APPLE)
+   INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
+ else()
+-  INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
++  INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+ ########### install files ###############
+diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
+index 26eda3e..42857ed 100644
+--- a/src/lib/marble/CMakeLists.txt
++++ b/src/lib/marble/CMakeLists.txt
+@@ -438,7 +438,7 @@ if(WIN32)
+ elseif(APPLE)
+   install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
+ else()
+-  install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
++  install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+