diff --git a/pcl.spec b/pcl.spec
index 8711367..a98c474 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -84,7 +84,7 @@ rm -rf  3rdparty
 mkdir build
 pushd build
 %cmake \
-  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_BUILD_TYPE=NONE \
   -DOPENNI_INCLUDE_DIR:PATH=/usr/include/ni \
   -DLIB_INSTALL_DIR=$(echo %{_libdir} | sed -e 's|%{_prefix}/||') \
   -DPCL_PKGCONFIG_SUFFIX:STRING="" \
@@ -127,15 +127,16 @@ popd
 
 mv doc/tutorials/html doc/tutorials/tutorials
 
-for f in $RPM_BUILD_ROOT%{_bindir}/*; do
+for f in $RPM_BUILD_ROOT%{_bindir}/{openni_image,pcd_grabber_viewer,pcd_viewer,openni_viewer,oni_viewer}; do
 	mv $f $RPM_BUILD_ROOT%{_bindir}/pcl_$(basename $f)
 done
+rm $RPM_BUILD_ROOT%{_bindir}/{openni_fast_mesh,openni_ii_normal_estimation,openni_voxel_grid}
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmake/pcl
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/pcl
 
 # Remove installed documentation, will add with doc tags later
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-1.5
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-1.6
 
 #mv $RPM_BUILD_ROOT%{_libdir}/pcl/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/pcl
 #rmdir $RPM_BUILD_ROOT%{_libdir}/pcl
@@ -162,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS.txt LICENSE.txt
 %{_libdir}/*.so.*
-%{_datadir}/%{name}-1.5
+%{_datadir}/%{name}-1.6
 
 %files devel
 %defattr(-,root,root,-)