diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cf532db0c5a257d7d669f437b6e0dbc1640cb16..26607e294e92cc91b85313b36dbbb4dff232c07d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,9 +20,6 @@ find_package(Boost COMPONENTS program_options random system thread filesystem ch
 link_directories(${Boost_LIBRARY_DIRS})
 set(LIBS ${LIBS} ${Boost_LIBRARIES})
 
-find_package(amqpcpp REQUIRED)
-set(LIBS ${LIBS} amqpcpp)
-
 find_package(Threads)
 set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
diff --git a/Dockerfile b/Dockerfile
index b53c6f3745baf0bb05c625b4c252fec8bf5bfff7..ce1747c22b5d12a0db820fe6a811ac259df1e355 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,8 @@ RUN apt-get update && \
         libboost-all-dev \
         libicu-dev \
         libloki-dev \
-	wsnlp=1.0.0 \
-	pwrutils \
+    	wsnlp-16-04 \
+    	pwrutils \
         toki
 
 WORKDIR /home/install