diff --git a/gnuradio-3.6.5-cmake-modules-fix.patch b/gnuradio-3.6.5-cmake-modules-fix.patch
new file mode 100644
index 0000000..a050854
--- /dev/null
+++ b/gnuradio-3.6.5-cmake-modules-fix.patch
@@ -0,0 +1,19 @@
+diff -up gnuradio-3.6.5/CMakeLists.txt.orig gnuradio-3.6.5/CMakeLists.txt
+--- gnuradio-3.6.5/CMakeLists.txt.orig	2013-05-26 19:31:51.000000000 +0200
++++ gnuradio-3.6.5/CMakeLists.txt	2013-06-04 15:29:18.766492710 +0200
+@@ -294,9 +294,13 @@ SET(cmake_configs
+   ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake
+ )
+ 
++if(NOT CMAKE_MODULES_DIR)
++   set(CMAKE_MODULES_DIR lib/cmake/gnuradio)
++endif(NOT CMAKE_MODULES_DIR)
++
+ install(
+-  FILES ${cmake_configs} 
+-  DESTINATION lib/cmake/gnuradio
++  FILES ${cmake_configs}
++  DESTINATION ${CMAKE_MODULES_DIR}
+   COMPONENT "runtime_devel"
+ )
+ 
diff --git a/gnuradio.spec b/gnuradio.spec
index f48c9b1..f99368d 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -44,11 +44,14 @@ BuildRequires:	portaudio-devel, libtool
 BuildRequires:	gsl-devel, tex(latex), numpy, PyQt4-devel, PyQwt-devel
 BuildRequires:	qwt-devel, qwtplot3d-qt4-devel, python-cheetah
 BuildRequires:	xdg-utils, python-lxml, pygtk2-devel, orc-devel
-BuildRequires:	uhd-devel
+BuildRequires:	uhd-devel, dos2unix
 Requires:	numpy, wxPython, scipy, portaudio, python-lxml
 Requires:	pygtk2, python-cheetah, PyQt4, PyQwt
 Obsoletes:	usrp < 3.3.0-1
 Obsoletes:	grc < 0.80-1
+# Make cmake modules installation directory configurable,
+# patch sent upstream, ticket 548
+Patch0:		gnuradio-3.6.5-cmake-modules-fix.patch
 
 %description
 GNU Radio is a collection of software that when combined with minimal 
@@ -86,9 +89,15 @@ GNU Radio examples
 %prep
 %setup -q
 
+%patch0 -p1 -b .cmake-modules-fix
+
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
 
+# Convert CR + LF to LF in GnuradioConfig.cmake and GnuradioConfigVersion.cmake.in
+# upstream ticket 549
+dos2unix cmake/Modules/{GnuradioConfig.cmake,GnuradioConfigVersion.cmake.in}
+
 %build
 mkdir build
 cd build
@@ -102,12 +111,15 @@ cd build
 -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \
 -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \
 -DENABLE_GR_FCD=FORCE \
--DSYSCONFDIR=/etc \
+-DSYSCONFDIR=%{_sysconfdir} \
+-DCMAKE_MODULES_DIR=%{_datadir}/cmake/Modules \
 %{?mfpu_neon} \
 ..
 
-# make with -j1 and compile without strict-aliasing
-make %{?my_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
+## make with -j1 and compile without strict-aliasing
+#make %{?my_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
+
+make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
 %install
 rm -rf %{buildroot}
@@ -143,6 +155,7 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/cmake/Modules/*.cmake
 
 %files doc
 %defattr(-,root,root,-)
@@ -154,9 +167,13 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
-* Tue May 28 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.6.5-1
+* Tue Jun  4 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.6.5-1
 - New version
   Resolves: rhbz#967804
+- Make cmake modules installation directory configurable
+  (by cmake-modules-fix patch)
+- Tried to switch back to parallel build (hopefully the koji builder
+  machines have now enough resources)
 
 * Wed Mar 20 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.6.4.1-1
 - New version