diff --git a/README.md b/README.md
index a3d81f8af..4c938a0ad 100644
--- a/README.md
+++ b/README.md
@@ -370,7 +370,7 @@ $ sudo make install
 
 ###### Build FMCOMMS2 based SDR Hardware support (OPTIONAL):
 
-Install [libiio](https://github.com/analogdevicesinc/libiio.git), [libad9361](https://github.com/analogdevicesinc/libad9361-iio.git) and [gr-iio](https://github.com/analogdevicesinc/gr-iio.git) gnuradio block (instructions based on https://www.plutosdr.com/viewtopic.php?t=5):
+Install the [libiio](https://github.com/analogdevicesinc/libiio.git) (>=v0.11), [libad9361](https://github.com/analogdevicesinc/libad9361-iio.git) (>=v0.1-1) libraries and [gr-iio](https://github.com/analogdevicesinc/gr-iio.git) (>=v0.2) gnuradio block. For example in Ubuntu 16.04 follow these instructions (based on https://github.com/blurbdust/blurbdust.github.io):
 
 ~~~~~~
 $ git clone https://github.com/analogdevicesinc/libiio.git
@@ -410,13 +410,22 @@ $ sudo make install
 $ sudo ldconfig
 ~~~~~~
 
-Then configure the gnss-sdr to build the `Fmcomms2_Signal_Source`:
+Then configure the gnss-sdr to build the `Fmcomms2_Signal_Source` and `Plutosdr_Signal_Source`:
 ~~~~~~
 $ cmake -DENABLE_FMCOMMS2=ON ../
-$ make 
+$ make
 $ sudo make install
 ~~~~~~
 
+or configure only `Plutosdr_Signal_Source`:
+~~~~~~
+$ cmake -DENABLE_PLUTOSDR=ON ../
+$ make
+$ sudo make install
+~~~~~~
+
+With `Fmcomms2_Signal_Source` you can use any SDR hardware based on fmcomms2, including the ADALM-PLUTO (PlutoSdr) by configuring correctly the .conf file. The `Plutosdr_Signal_Source` offers a simplier manner to use the ADALM-PLUTO because implements only a subset of fmcomms2's parameters valid for it device.
+
 ###### Build OpenCL support (OPTIONAL):
 
 In order to enable the building of blocks that use OpenCL, type:
diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index 2cc169ed9..009f56433 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -29,10 +29,11 @@ if(ENABLE_PLUTOSDR)
 	if(NOT IIO_FOUND)
 		message("gnuradio-iio not found, installation is required")
 		message(FATAL_ERROR "gnuradio-iio required for building gnss-sdr with this option enabled")
-	endif(NOT IIO_FOUND)
-	set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
-     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
-     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} plutosdr_signal_source.cc)
+	else(NOT IIO_FOUND)
+	    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
+        set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
+        set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} plutosdr_signal_source.cc)
+    endif(NOT IIO_FOUND)
 endif(ENABLE_PLUTOSDR)
 
 if(ENABLE_FMCOMMS2)
@@ -43,10 +44,11 @@ if(ENABLE_FMCOMMS2)
 	if(NOT IIO_FOUND)
 		message("gnuradio-iio not found, installation is required")
 		message(FATAL_ERROR "gnuradio-iio required for building gnss-sdr with this option enabled")
-	endif(NOT IIO_FOUND)
-	set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
-     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
-     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} fmcomms2_signal_source.cc plutosdr_signal_source.cc)
+	else(NOT IIO_FOUND)
+	    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
+        set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
+        set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} fmcomms2_signal_source.cc plutosdr_signal_source.cc)
+   endif(NOT IIO_FOUND)
 endif(ENABLE_FMCOMMS2)
 
 if(ENABLE_GN3S)