diff --git a/1.5.2.tar.gz b/1.5.2.tar.gz
deleted file mode 100644
index 23409a0..0000000
--- a/1.5.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55d5ad859d86588285526627cec74afeadeb9bc6b7dc3c327ec3d14ac5c380dd
-size 196493
diff --git a/1.5.4.tar.gz b/1.5.4.tar.gz
new file mode 100644
index 0000000..8403940
--- /dev/null
+++ b/1.5.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc5bee86ecd3acd80227630fac41ba7925f3bf0be6e559e30567750d57b2d7c0
+size 197384
diff --git a/jsoncpp.changes b/jsoncpp.changes
index 78315ff..5e0fc2e 100644
--- a/jsoncpp.changes
+++ b/jsoncpp.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Mon Mar  9 08:36:27 UTC 2015 - mpluskal@suse.com
+
+- Create and install cmake files
+- Define libname to make maintenance easier
+- Update to 1.5.4
+  * Support embedded 0s in strings (since UTF-8 allows them).
+    + If you use c-string methods, or std::string::c_str(), you 
+      can still have problems.
+    + Note that this support has a price: keys are now limited to 
+      1 billion characters (2^30).
+  * Add feature to allow single-quotes in input JSON (since 
+    JavaScript allows them).
+  * Propagate rarely-used StaticString thru copy-ctor.
+  * Let JSON_ASSERT throw std::logic_error instead of 
+    std::runtime_error.
+  * Skip Python tests by default, and run C++ unit-tests only for 
+    changes.
+  * Ignore cmake-generated files for in-source builds.
+  * Add tests. Fix other tests.
+  * Remove unused code (JSON_VALUE_USE_INTERNAL_MAP).
+  * Add rejectDupKeys feature.
+    + Now part of strictMode.
+  * Fix minor build issues for VisualStudio.
+  * Fix compile error for VS2013, plus warnings.
+  * Add operator[] to Builders.
+  * In Builders, fix ::validate() (which was always returning 
+    true).
+  * Fix UTF-8 zeroes bugs in previous patch-versions.
+
 -------------------------------------------------------------------
 Fri Mar  6 18:24:11 UTC 2015 - mpluskal@suse.com
 
diff --git a/jsoncpp.spec b/jsoncpp.spec
index 66348d2..2a98cc8 100644
--- a/jsoncpp.spec
+++ b/jsoncpp.spec
@@ -16,8 +16,9 @@
 #
 
 
+%define libname lib%{name}1
 Name:           jsoncpp
-Version:        1.5.2
+Version:        1.5.4
 Release:        0
 Summary:        C++ library that allows manipulating with JSON
 License:        MIT
@@ -45,7 +46,7 @@ format to store user input files.
 %package devel
 Summary:        Development files for %{name}
 Group:          Development/Languages/C and C++
-Requires:       lib%{name}1 = %{version}
+Requires:       %{libname} = %{version}
 
 %description devel
 JSON is a lightweight data-interchange format. It can represent numbers,
@@ -70,11 +71,11 @@ serialization and deserialization to and from strings. It can also preserve
 existing comment in unserialization/serialization steps, making it a convenient
 format to store user input files.
 
-%package -n lib%{name}1
+%package -n %{libname}
 Summary:        Shared library for %{name}
 Group:          System/Libraries
 
-%description -n lib%{name}1
+%description -n %{libname}
 JSON is a lightweight data-interchange format. It can represent numbers,
 strings, ordered sequences of values, and collections of name/value pairs.
 
@@ -91,7 +92,8 @@ python doxybuild.py --doxygen=%{_bindir}/doxygen --open --with-dot
 
 # path needs to be exported otherwise unit tests will fail
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/build/src/lib_json
-%cmake -DJSONCPP_LIB_BUILD_SHARED=ON
+%cmake \
+	-DJSONCPP_WITH_CMAKE_PACKAGE=ON
 
 make %{?_smp_mflags}
 
@@ -100,11 +102,11 @@ make %{?_smp_mflags}
 %fdupes -s dist/doxygen
 rm -rf %{buildroot}%{_libdir}/lib%{name}.a
 
-%post -n lib%{name}1 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -n lib%{name}1  -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files -n lib%{name}1
+%files -n %{libname}
 %defattr(-,root,root)
 %doc LICENSE
 %{_libdir}/lib%{name}.so.*
@@ -113,6 +115,7 @@ rm -rf %{buildroot}%{_libdir}/lib%{name}.a
 %defattr(-,root,root)
 %doc AUTHORS LICENSE NEWS.txt README.md
 %{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/cmake/%{name}
 %{_libdir}/lib%{name}.so
 %{_includedir}/json/