Index: contrib/llvm/patches/patch-01-clang-vendor-suffix.diff
===================================================================
--- contrib/llvm/patches/patch-01-clang-vendor-suffix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-This patch adds a FreeBSD-specific suffix to clang's version string.  This is
-usually of the form "(yyyyddmm)", representing the date when the compiler was
-last updated.
-
-Introduced here: http://svnweb.freebsd.org/changeset/base/209107
-
-Index: tools/clang/lib/Basic/Version.cpp
-===================================================================
---- tools/clang/lib/Basic/Version.cpp
-+++ tools/clang/lib/Basic/Version.cpp
-@@ -128,8 +128,10 @@ std::string getClangToolFullVersion(StringRef Tool
-   OS << ToolName << " version " CLANG_VERSION_STRING " "
-      << getClangFullRepositoryVersion();
- 
-+#ifdef CLANG_VENDOR_SUFFIX
-+  OS << CLANG_VENDOR_SUFFIX;
-+#elif defined(CLANG_VENDOR)
-   // If vendor supplied, include the base LLVM version as well.
--#ifdef CLANG_VENDOR
-   OS << " (based on " << BACKEND_PACKAGE_STRING << ")";
- #endif
- 
Index: contrib/llvm/tools/clang/lib/Basic/Version.cpp
===================================================================
--- contrib/llvm/tools/clang/lib/Basic/Version.cpp
+++ contrib/llvm/tools/clang/lib/Basic/Version.cpp
@@ -128,10 +128,8 @@
   OS << ToolName << " version " CLANG_VERSION_STRING " "
      << getClangFullRepositoryVersion();
 
-#ifdef CLANG_VENDOR_SUFFIX
-  OS << CLANG_VENDOR_SUFFIX;
-#elif defined(CLANG_VENDOR)
   // If vendor supplied, include the base LLVM version as well.
+#ifdef CLANG_VENDOR
   OS << " (based on " << BACKEND_PACKAGE_STRING << ")";
 #endif
 
Index: lib/clang/include/clang/Basic/Version.inc
===================================================================
--- lib/clang/include/clang/Basic/Version.inc
+++ lib/clang/include/clang/Basic/Version.inc
@@ -6,6 +6,5 @@
 #define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
-#define	CLANG_VENDOR_SUFFIX		" 20150906"
 
 #define	SVN_REVISION			"246257"