diff --git a/sicktoolbox-1.0.1-g++14.patch b/sicktoolbox-1.0.1-g++14.patch
new file mode 100644
index 0000000..8de8d8e
--- /dev/null
+++ b/sicktoolbox-1.0.1-g++14.patch
@@ -0,0 +1,36 @@
+diff -Naur sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.cc sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.cc
+--- sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.cc	2010-06-30 23:19:02.000000000 +0200
++++ sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.cc	2016-03-18 14:21:44.602788348 +0100
+@@ -4757,4 +4757,6 @@
+     
+   }
+ 
++  const double SickLD::SICK_MAX_SCAN_ANGULAR_RESOLUTION = 0.125;                       ///< Minimum valid separation between laser pulses in active 
++  const double SickLD::SICK_DEGREES_PER_MOTOR_STEP = 0.0625;                           ///< Each odometer tick is equivalent to rotating the scan he
+ } //namespace SickToolbox
+diff -Naur sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.hh sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.hh
+--- sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.hh	2010-06-30 23:19:02.000000000 +0200
++++ sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.hh	2016-03-18 14:17:22.270901575 +0100
+@@ -69,8 +69,8 @@
+     static const uint16_t SICK_MAX_MEAN_PULSE_FREQUENCY = 10800;                        ///< Max mean pulse frequence of the current device configuration (in Hz) (see page 22 of the operator's manual)
+     static const uint16_t SICK_MAX_PULSE_FREQUENCY = 14400;                             ///< Max pulse frequency of the device (in Hz) (see page 22 of the operator's manual)
+     static const uint16_t SICK_NUM_TICKS_PER_MOTOR_REV = 5760;                          ///< Odometer ticks per revolution of the Sick LD scan head
+-    static const double SICK_MAX_SCAN_ANGULAR_RESOLUTION = 0.125;                       ///< Minimum valid separation between laser pulses in active scan ares (deg)
+-    static const double SICK_DEGREES_PER_MOTOR_STEP = 0.0625;                           ///< Each odometer tick is equivalent to rotating the scan head this many degrees
++    static const double SICK_MAX_SCAN_ANGULAR_RESOLUTION /* = 0.125 */;                       ///< Minimum valid separation between laser pulses in active scan ares (deg)
++    static const double SICK_DEGREES_PER_MOTOR_STEP /* = 0.0625 */;                           ///< Each odometer tick is equivalent to rotating the scan head this many degrees
+     
+     /* Sick LD sensor modes of operation */
+     static const uint8_t SICK_SENSOR_MODE_IDLE = 0x01;                                  ///< The Sick LD is powered but idle
+diff -Naur sicktoolbox-1.0.1.orig/c++/examples/ld/ld_config/src/main.cc sicktoolbox-1.0.1/c++/examples/ld/ld_config/src/main.cc
+--- sicktoolbox-1.0.1.orig/c++/examples/ld/ld_config/src/main.cc	2010-06-30 23:25:02.000000000 +0200
++++ sicktoolbox-1.0.1/c++/examples/ld/ld_config/src/main.cc	2016-03-18 14:25:45.336849106 +0100
+@@ -260,7 +260,7 @@
+   config_path = getFilename();
+ 
+   /* Instantiate the parser */
+-  if(ifstream(config_path.c_str()) != NULL) {
++  if(ifstream(config_path.c_str())) {
+     sick_config_file = ConfigFile(config_path);
+   }
+   else {
diff --git a/sicktoolbox.spec b/sicktoolbox.spec
index 449e40d..3218dc8 100644
--- a/sicktoolbox.spec
+++ b/sicktoolbox.spec
@@ -9,10 +9,12 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{version}/%{name}-%{ve
 # Add missing unistd.h to source files.
 # Filed upstream at https://sourceforge.net/tracker/?func=detail&aid=3577232&group_id=219500&atid=1047068
 Patch0:         %{name}-1.0.1-fixbuild.patch
-
+# Fix c++14 incompatibilities
+# Filed upstream at https://sourceforge.net/p/sicktoolbox/patches/5/
+Patch1:         %{name}-1.0.1-g++14.patch
 %description
-The Sick LIDAR Toolbox is an open-source software package released under a 
-BSD Open-Source License that provides stable and easy-to-use C++ drivers 
+The Sick LIDAR Toolbox is an open-source software package released under a
+BSD Open-Source License that provides stable and easy-to-use C++ drivers
 for Sick LMS 2xx and Sick LD laser range finders.
 
 %package devel
@@ -33,6 +35,7 @@ Assorted documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 %configure --disable-static --program-prefix=sick_
@@ -48,7 +51,8 @@ rm -rf %{buildroot}%{_libdir}/*.la
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING ChangeLog README THANKS NEWS 
+%license COPYING
+%doc AUTHORS ChangeLog README THANKS NEWS
 %{_bindir}/*_config
 %{_libdir}/*.so.*
 
@@ -61,6 +65,9 @@ rm -rf %{buildroot}%{_libdir}/*.la
 %doc manuals/*.pdf
 
 %changelog
+* Tue Jul 05 2016 Rich Mattes <richmattes@gmail.com> - 1.0.1-5
+- Apply Ralf's patch to fix FTBFS (rhbz#1308128)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild