diff --git a/graphite-nonvoid-return.patch b/graphite-nonvoid-return.patch
new file mode 100644
index 0000000..59e4842
--- /dev/null
+++ b/graphite-nonvoid-return.patch
@@ -0,0 +1,12 @@
+Index: graphite2-1.3.0/tests/bittwiddling/bits.cpp
+===================================================================
+--- graphite2-1.3.0.orig/tests/bittwiddling/bits.cpp
++++ graphite2-1.3.0/tests/bittwiddling/bits.cpp
+@@ -81,6 +81,7 @@ namespace
+     {
+         if (!std::numeric_limits<T>::is_signed) o.put('u');
+         o << "int" << std::dec << sizeof(T)*8;
++        return 0;
+     }
+     
+ 	template<typename T>
diff --git a/graphite2-1.2.0-cmakepath.patch b/graphite2-1.2.0-cmakepath.patch
new file mode 100644
index 0000000..747ac80
--- /dev/null
+++ b/graphite2-1.2.0-cmakepath.patch
@@ -0,0 +1,9 @@
+diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt
+--- graphite2-1.2.0.orig/src/CMakeLists.txt	2013-01-29 15:47:32.465841769 +0530
++++ graphite2-1.2.0/src/CMakeLists.txt	2013-01-29 15:48:24.056843352 +0530
+@@ -136,4 +136,4 @@
+ 
+ 
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
+-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_)
diff --git a/graphite2.spec b/graphite2.spec
index 4ee3f34..17d55da 100644
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -26,6 +26,8 @@ Group:          Productivity/Publishing/Word
 Url:            http://sourceforge.net/projects/silgraphite/
 Source0:        http://downloads.sourceforge.net/silgraphite/graphite2-%{version}.tgz
 Source1:        baselibs.conf
+Patch0:         graphite2-1.2.0-cmakepath.patch
+Patch1:         graphite-nonvoid-return.patch
 Patch2:         link-gcc-shared.diff
 BuildRequires:  asciidoc
 BuildRequires:  cmake
@@ -77,6 +79,8 @@ This package contains the %{name} development files.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 %patch2
 
 %build
@@ -116,6 +120,6 @@ ctest --output-on-failure
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}*.pc
 %{_includedir}/%{name}*
-%{_datadir}/%{name}*
+%{_libdir}/%{name}*
 
 %changelog