diff --git a/serial.cmake b/serial.cmake
index 2d31b12..232e4c1 100644
--- a/serial.cmake
+++ b/serial.cmake
@@ -41,7 +41,7 @@ ENDIF(NOT DEFINED(LIBRARY_OUTPUT_PATH))
 include_directories(${PROJECT_SOURCE_DIR}/include)
 
 # Add default source files
-set(SERIAL_SRCS src/serial.cc src/impl/unix.cc) # src/serial_listener.cc)
+set(SERIAL_SRCS src/serial.cc src/impl/unix.cc src/serial_listener.cc)
 # Add default header files
 set(SERIAL_HEADERS include/serial/serial.h include/serial/serial_listener.h)
 
diff --git a/src/serial.cc b/src/serial.cc
index a975aa2..b5b0c05 100644
--- a/src/serial.cc
+++ b/src/serial.cc
@@ -20,7 +20,7 @@ Serial::Serial (const string &port, int baudrate, long timeout,
                 bytesize_t bytesize, parity_t parity, stopbits_t stopbits,
                 flowcontrol_t flowcontrol)
 {
-  pimpl = new Serial_pimpl(port, baudrate, timeout, bytesize, parity,
+  pimpl = new SerialImpl(port, baudrate, timeout, bytesize, parity,
                            stopbits, flowcontrol);
 }