diff --git a/dev-util/cppcheck/cppcheck-1.83.recipe b/dev-util/cppcheck/cppcheck-1.85.recipe
similarity index 86%
rename from dev-util/cppcheck/cppcheck-1.83.recipe
rename to dev-util/cppcheck/cppcheck-1.85.recipe
index 251545502..0e70749d6 100644
--- a/dev-util/cppcheck/cppcheck-1.83.recipe
+++ b/dev-util/cppcheck/cppcheck-1.85.recipe
@@ -12,11 +12,12 @@ COPYRIGHT="2007-2018 Cppcheck team"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/danmar/cppcheck/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="7d3656762beee8087e234a796c900c84b004ac241301106b6a2c01ef2beff095"
+CHECKSUM_SHA256="dc17ecf2f6bacbee32141fe7713747de9026bbb36207bfad2d73a5185c6b14a3"
+SOURCE_FILENAME="cppcheck-$portVersion.tar.gz"
 PATCHES="cppcheck-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	cppcheck$secondaryArchSuffix = $portVersion
@@ -51,6 +52,7 @@ BUILD()
 		-DBUILD_SHARED_LIBS=ON \
 		-DBUILD_TESTS=ON \
 		-DHAVE_RULES=ON \
+		-DCFGDIR=$settingsDir/cppcheck \
 		$cmakeDirArgs
 
 	make $jobArgs
diff --git a/dev-util/cppcheck/patches/cppcheck-1.83.patchset b/dev-util/cppcheck/patches/cppcheck-1.85.patchset
similarity index 71%
rename from dev-util/cppcheck/patches/cppcheck-1.83.patchset
rename to dev-util/cppcheck/patches/cppcheck-1.85.patchset
index cfc06cc2f..545b574cd 100644
--- a/dev-util/cppcheck/patches/cppcheck-1.83.patchset
+++ b/dev-util/cppcheck/patches/cppcheck-1.85.patchset
@@ -5,7 +5,7 @@ Subject: Haiku patches
 
 
 diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
-index bfaa398..8a3cd8c 100644
+index 8da7086..f259391 100644
 --- a/cli/cppcheckexecutor.cpp
 +++ b/cli/cppcheckexecutor.cpp
 @@ -52,7 +52,7 @@
@@ -18,7 +18,7 @@ index bfaa398..8a3cd8c 100644
  #endif
  #ifdef __linux__
 diff --git a/cli/filelister.cpp b/cli/filelister.cpp
-index ff2112b..86dfa0e 100644
+index 52a9400..7e51de4 100644
 --- a/cli/filelister.cpp
 +++ b/cli/filelister.cpp
 @@ -204,6 +204,7 @@ static void addFiles2(std::map<std::string, std::size_t> &files,
@@ -38,10 +38,10 @@ index ff2112b..86dfa0e 100644
              closedir(dir);
          } else
 diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
-index bc73870..fea5e25 100644
+index f0534d5..028a28f 100644
 --- a/cli/threadexecutor.cpp
 +++ b/cli/threadexecutor.cpp
-@@ -150,7 +150,7 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
+@@ -143,7 +143,7 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
  
  bool ThreadExecutor::checkLoadAverage(size_t nchildren)
  {
@@ -51,10 +51,10 @@ index bc73870..fea5e25 100644
  #else
      if (!nchildren || !_settings.loadAverage) {
 diff --git a/cmake/compileroptions.cmake b/cmake/compileroptions.cmake
-index 8f6e957..17b3d1c 100644
+index ef41288..8c74b42 100644
 --- a/cmake/compileroptions.cmake
 +++ b/cmake/compileroptions.cmake
-@@ -5,9 +5,13 @@ set(EXTRA_C_FLAGS_DEBUG "-DDEBUG -O0")
+@@ -5,9 +5,13 @@ set(EXTRA_C_FLAGS_DEBUG "-DDEBUG")
  if (USE_CLANG)
      set (CMAKE_C_COMPILER_ID            "Clang")
      set (CMAKE_CXX_COMPILER_ID          "Clang")
@@ -74,3 +74,28 @@ index 8f6e957..17b3d1c 100644
 -- 
 2.16.2
 
+
+From 7d641cef19798b763ed81c9a844bc2bca6f93345 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 15 Aug 2018 20:23:10 +0200
+Subject: Data Path
+
+
+diff --git a/cmake/compilerDefinitions.cmake b/cmake/compilerDefinitions.cmake
+index 7179c68..992a2bb 100644
+--- a/cmake/compilerDefinitions.cmake
++++ b/cmake/compilerDefinitions.cmake
+@@ -5,5 +5,9 @@ if (UNIX)
+     if (HAVE_RULES)
+         add_definitions(-DHAVE_RULES -DTIXML_USE_STL)
+     endif()
+-    add_definitions(-DCFGDIR="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
++    if (NOT HAIKU)
++        add_definitions(-DCFGDIR="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
++    else()
++        add_definitions(-DCFGDIR="${CMAKE_INSTALL_PREFIX}/data/${PROJECT_NAME}")
++    endif()
+ endif()
+-- 
+2.16.4
+