diff --git a/media-gfx/graphite2/graphite2-1.3.6.recipe b/media-gfx/graphite2/graphite2-1.3.8.recipe
similarity index 74%
rename from media-gfx/graphite2/graphite2-1.3.6.recipe
rename to media-gfx/graphite2/graphite2-1.3.8.recipe
index d5f3740e9..294ecd01d 100644
--- a/media-gfx/graphite2/graphite2-1.3.6.recipe
+++ b/media-gfx/graphite2/graphite2-1.3.8.recipe
@@ -1,14 +1,14 @@
 SUMMARY="Graphite text processing engine"
-DESCRIPTION="
-Graphite2 is a library providing rendering capabilities for complex non-Roman \
-writing systems."
-HOMEPAGE="http://graphite.sil.org"
-COPYRIGHT="2010-2013 SIL International"
+DESCRIPTION="Graphite2 is a library providing rendering capabilities for \
+complex non-Roman writing systems."
+HOMEPAGE="http://graphite.sil.org/"
+COPYRIGHT="2010-2016 SIL International"
 LICENSE="GNU LGPL v2.1"
-SOURCE_URI="https://github.com/silnrsi/graphite/releases/download/$portVersion/graphite-$portVersion.tgz"
-CHECKSUM_SHA256="475e7657ac606ed8805518031729c1273cf7d9d422169ac6f7882e01d832af75"
-PATCHES="graphite2-$portVersion.patchset"
 REVISION="1"
+SOURCE_URI="https://github.com/silnrsi/graphite/releases/download/$portVersion/graphite2-$portVersion.tgz"
+CHECKSUM_SHA256="9f3f25b3a8495ce0782e77f69075c0dd9b7c054847b9bf9ff130bec38f4c8cc2"
+PATCHES="graphite2-$portVersion.patchset"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
@@ -19,6 +19,17 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	graphite2${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
+	devel:libgraphite2$secondaryArchSuffix = 3.0.1 compat >= 3
+	cmd:gr2fonttest$secondaryArchSuffix
+	"
+REQUIRES_devel="
+	graphite2$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -47,15 +58,3 @@ INSTALL()
 		$binDir \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	graphite2${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
-	devel:libgraphite2$secondaryArchSuffix = 3.0.1 compat >= 3
-	cmd:gr2fonttest$secondaryArchSuffix
-	"
-REQUIRES_devel="
-	graphite2$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix
-	"
diff --git a/media-gfx/graphite2/patches/graphite2-1.3.6.patchset b/media-gfx/graphite2/patches/graphite2-1.3.8.patchset
similarity index 89%
rename from media-gfx/graphite2/patches/graphite2-1.3.6.patchset
rename to media-gfx/graphite2/patches/graphite2-1.3.8.patchset
index 2a5dd2e48..0c31bb805 100644
--- a/media-gfx/graphite2/patches/graphite2-1.3.6.patchset
+++ b/media-gfx/graphite2/patches/graphite2-1.3.8.patchset
@@ -8,7 +8,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index b09e95f..279eadd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -71,7 +71,7 @@ endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
+@@ -66,7 +66,7 @@ endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
  
  set(version 3.0.1)
  set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
@@ -21,7 +21,7 @@ diff --git a/gr2fonttest/CMakeLists.txt b/gr2fonttest/CMakeLists.txt
 index 39529fa..fa9ce23 100644
 --- a/gr2fonttest/CMakeLists.txt
 +++ b/gr2fonttest/CMakeLists.txt
-@@ -32,5 +32,5 @@ add_custom_target(${PROJECT_NAME}_copy_dll ALL
+@@ -21,5 +21,5 @@ add_custom_target(${PROJECT_NAME}_copy_dll ALL
  
  add_dependencies(${PROJECT_NAME}_copy_dll graphite2 gr2fonttest)
  
@@ -32,7 +32,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index f785070..4902dbc 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -148,5 +148,5 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+@@ -151,5 +151,5 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
  endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")