diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c
index b77cb4efa..7b0291f6e 100644
--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@@ -486,10 +486,9 @@ boolean xf_event_process(freerdp* instance, XEvent* event)
 			app = True;
 	}
 
-#if WITH_DEBUG_X11
+
 	if (event->type != MotionNotify)
 		DEBUG_X11("%s Event: wnd=0x%04X", X11_EVENT_STRINGS[event->type], (uint32) event->xany.window);
-#endif
 
 	switch (event->type)
 	{
diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c
index b9a3efa13..7e438d04d 100644
--- a/client/X11/xf_rail.c
+++ b/client/X11/xf_rail.c
@@ -333,16 +333,15 @@ void xf_process_rail_server_minmaxinfo_event(xfInfo* xfi, rdpChanMan* chanman, R
 		xfWindow * window = NULL;
 		window = (xfWindow *) rail_window->extra;
 
-		printf("Server Min Max Info PDU: windowId=0x%X "
-			"maxWidth=%d maxHeight=%d maxPosX=%d maxPosY=%d "
-			"minTrackWidth=%d minTrackHeight=%d maxTrackWidth=%d maxTrackHeight=%d\n",
+		DEBUG_X11("windowId=0x%X maxWidth=%d maxHeight=%d maxPosX=%d maxPosY=%d "
+			"minTrackWidth=%d minTrackHeight=%d maxTrackWidth=%d maxTrackHeight=%d",
 			minmax->windowId, minmax->maxWidth, minmax->maxHeight,
 			(sint16)minmax->maxPosX, (sint16)minmax->maxPosY,
 			minmax->minTrackWidth, minmax->minTrackHeight,
 			minmax->maxTrackWidth, minmax->maxTrackHeight);
 
 		xf_SetWindowMinMaxInfo(xfi, window, minmax->maxWidth, minmax->maxHeight, minmax->maxPosX, minmax->maxPosY,
-				minmax->minTrackWidth, minmax->minTrackHeight, minmax->maxTrackWidth, minmax->maxTrackHeight);
+			minmax->minTrackWidth, minmax->minTrackHeight, minmax->maxTrackWidth, minmax->maxTrackHeight);
 	}
 }
 
@@ -374,8 +373,7 @@ void xf_process_rail_server_localmovesize_event(xfInfo* xfi, rdpChanMan* chanman
 		xfWindow * window = NULL;
 		window = (xfWindow *) rail_window->extra;
 
-		printf("Server Local MoveSize PDU: windowId=0x%X "
-			"isMoveSizeStart=%d moveSizeType=%s PosX=%d PosY=%d\n",
+		DEBUG_X11("windowId=0x%X isMoveSizeStart=%d moveSizeType=%s PosX=%d PosY=%d",
 			movesize->windowId, movesize->isMoveSizeStart,
 			movetype_names[movesize->moveSizeType], (sint16)movesize->posX, (sint16)movesize->posY);
 
diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
index 295b0cd88..9715771bc 100644
--- a/cmake/ConfigOptions.cmake
+++ b/cmake/ConfigOptions.cmake
@@ -9,6 +9,8 @@ option(WITH_DEBUG_CERTIFICATE "Print certificate related debug messages." OFF)
 option(WITH_DEBUG_LICENSE "Print license debug messages." OFF)
 option(WITH_DEBUG_GDI "Print graphics debug messages." OFF)
 option(WITH_DEBUG_RFX "Print RemoteFX debug messages." OFF)
+option(WITH_DEBUG_X11 "Print X11 Client debug messages" OFF)
+option(WITH_DEBUG_RAIL "Print RemoteApp debug messages" OFF)
 option(WITH_MANPAGES "Generate manpages." ON)
 option(WITH_PROFILER "Compile profiler." OFF)
 option(WITH_SSE2 "Use SSE2 optimization." OFF)
diff --git a/config.h.in b/config.h.in
index 360067bd7..9eea02667 100644
--- a/config.h.in
+++ b/config.h.in
@@ -31,5 +31,7 @@
 #cmakedefine WITH_DEBUG_RFX
 #cmakedefine WITH_PROFILER
 #cmakedefine WITH_SSE2
+#cmakedefine WITH_DEBUG_X11
+#cmakedefine WITH_DEBUG_RAIL
 
 #endif
diff --git a/libfreerdp-rail/window.c b/libfreerdp-rail/window.c
index 8dd789d4f..6a41f6121 100644
--- a/libfreerdp-rail/window.c
+++ b/libfreerdp-rail/window.c
@@ -143,7 +143,7 @@ void window_state_update(rdpWindow* window, WINDOW_ORDER_INFO* orderInfo, WINDOW
 		DEBUG_RAIL("ownerWindowId:0x%08X", window->ownerWindowId);
 	}
 
-	DEBUG_RAIL("window_state_update: windowId=0x%X ownerWindowId=0x%X\n",
+	DEBUG_RAIL("windowId=0x%X ownerWindowId=0x%X",
 			window->windowId, window->ownerWindowId);
 
 	if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_STYLE)