diff --git a/server/Mac/CMakeLists.txt b/server/Mac/CMakeLists.txt
index c2351f3ac..d60a8bbb4 100644
--- a/server/Mac/CMakeLists.txt
+++ b/server/Mac/CMakeLists.txt
@@ -29,16 +29,18 @@ FIND_LIBRARY(IOSURFACE IOSurface)
 set(${MODULE_PREFIX}_SRCS
 	mfreerdp.c
 	mfreerdp.h
-    mf_interface.c
-    mf_interface.h
+	mf_interface.c
+	mf_interface.h
 	mf_event.c
 	mf_event.h
-    mf_peer.c
-    mf_peer.h
-    mf_info.c
-    mf_info.h
-    mf_mountain_lion.c
-    mf_mountain_lion.h)
+	mf_peer.c
+	mf_peer.h
+	mf_info.c
+	mf_info.h
+	mf_input.c
+	mf_input.h
+	mf_mountain_lion.c
+	mf_mountain_lion.h)
 
 if(CHANNEL_AUDIN_SERVER)
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS}
@@ -57,9 +59,9 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} 
 	freerdp-server
-    ${AUDIO_TOOL}
-    ${CORE_AUDIO}
-    ${CORE_VIDEO}
+	${AUDIO_TOOL}
+	${CORE_AUDIO}
+	${CORE_VIDEO}
 	${CORE_GRAPHICS}
 	${APP_SERVICES}
 	${IOKIT}
diff --git a/server/Mac/mf_input.c b/server/Mac/mf_input.c
new file mode 100644
index 000000000..c00bd1420
--- /dev/null
+++ b/server/Mac/mf_input.c
@@ -0,0 +1,205 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * FreeRDP Mac OS X Server (Input)
+ *
+ * Copyright 2013 Corey Clayton <can.of.tuna@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <winpr/windows.h>
+
+#include "wf_input.h"
+#include "wf_info.h"
+
+void wf_input_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
+{
+	INPUT keyboard_event;
+	
+	keyboard_event.type = INPUT_KEYBOARD;
+	keyboard_event.ki.wVk = 0;
+	keyboard_event.ki.wScan = code;
+	keyboard_event.ki.dwFlags = KEYEVENTF_SCANCODE;
+	keyboard_event.ki.dwExtraInfo = 0;
+	keyboard_event.ki.time = 0;
+	
+	if (flags & KBD_FLAGS_RELEASE)
+		keyboard_event.ki.dwFlags |= KEYEVENTF_KEYUP;
+	
+	if (flags & KBD_FLAGS_EXTENDED)
+		keyboard_event.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
+	
+	SendInput(1, &keyboard_event, sizeof(INPUT));
+}
+
+void wf_input_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
+{
+	INPUT keyboard_event;
+	
+	keyboard_event.type = INPUT_KEYBOARD;
+	keyboard_event.ki.wVk = 0;
+	keyboard_event.ki.wScan = code;
+	keyboard_event.ki.dwFlags = KEYEVENTF_UNICODE;
+	keyboard_event.ki.dwExtraInfo = 0;
+	keyboard_event.ki.time = 0;
+	
+	if (flags & KBD_FLAGS_RELEASE)
+		keyboard_event.ki.dwFlags |= KEYEVENTF_KEYUP;
+	
+	SendInput(1, &keyboard_event, sizeof(INPUT));
+}
+
+void wf_input_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y)
+{
+	INPUT mouse_event;
+	float width, height;
+	
+	ZeroMemory(&mouse_event, sizeof(INPUT));
+	mouse_event.type = INPUT_MOUSE;
+	
+	if (flags & PTR_FLAGS_WHEEL)
+	{
+		mouse_event.mi.dwFlags = MOUSEEVENTF_WHEEL;
+		mouse_event.mi.mouseData = flags & WheelRotationMask;
+		
+		if (flags & PTR_FLAGS_WHEEL_NEGATIVE)
+			mouse_event.mi.mouseData *= -1;
+		
+		SendInput(1, &mouse_event, sizeof(INPUT));
+	}
+	else
+	{
+		wfInfo * wfi;
+		
+		wfi = wf_info_get_instance();
+		
+		//width and height of primary screen (even in multimon setups
+		width = (float) GetSystemMetrics(SM_CXSCREEN);
+		height = (float) GetSystemMetrics(SM_CYSCREEN);
+		
+		x += wfi->servscreen_xoffset;
+		y += wfi->servscreen_yoffset;
+		
+		mouse_event.mi.dx = (LONG) ((float) x * (65535.0f / width));
+		mouse_event.mi.dy = (LONG) ((float) y * (65535.0f / height));
+		mouse_event.mi.dwFlags = MOUSEEVENTF_ABSOLUTE;
+		
+		if (flags & PTR_FLAGS_MOVE)
+		{
+			mouse_event.mi.dwFlags |= MOUSEEVENTF_MOVE;
+			SendInput(1, &mouse_event, sizeof(INPUT));
+		}
+		
+		mouse_event.mi.dwFlags = MOUSEEVENTF_ABSOLUTE;
+		
+		if (flags & PTR_FLAGS_BUTTON1)
+		{
+			if (flags & PTR_FLAGS_DOWN)
+				mouse_event.mi.dwFlags |= MOUSEEVENTF_LEFTDOWN;
+			else
+				mouse_event.mi.dwFlags |= MOUSEEVENTF_LEFTUP;
+			
+			SendInput(1, &mouse_event, sizeof(INPUT));
+		}
+		else if (flags & PTR_FLAGS_BUTTON2)
+		{
+			if (flags & PTR_FLAGS_DOWN)
+				mouse_event.mi.dwFlags |= MOUSEEVENTF_RIGHTDOWN;
+			else
+				mouse_event.mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
+			
+			SendInput(1, &mouse_event, sizeof(INPUT));
+		}
+		else if (flags & PTR_FLAGS_BUTTON3)
+		{
+			if (flags & PTR_FLAGS_DOWN)
+				mouse_event.mi.dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
+			else
+				mouse_event.mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
+			
+			SendInput(1, &mouse_event, sizeof(INPUT));
+		}
+	}
+}
+
+void wf_input_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y)
+{
+	if ((flags & PTR_XFLAGS_BUTTON1) || (flags & PTR_XFLAGS_BUTTON2))
+	{
+		INPUT mouse_event;
+		ZeroMemory(&mouse_event, sizeof(INPUT));
+		
+		mouse_event.type = INPUT_MOUSE;
+		
+		if (flags & PTR_FLAGS_MOVE)
+		{
+			float width, height;
+			wfInfo * wfi;
+			
+			wfi = wf_info_get_instance();
+			//width and height of primary screen (even in multimon setups
+			width = (float) GetSystemMetrics(SM_CXSCREEN);
+			height = (float) GetSystemMetrics(SM_CYSCREEN);
+			
+			x += wfi->servscreen_xoffset;
+			y += wfi->servscreen_yoffset;
+			
+			//mouse_event.mi.dx = x * (0xFFFF / width);
+			//mouse_event.mi.dy = y * (0xFFFF / height);
+			mouse_event.mi.dx = (LONG) ((float) x * (65535.0f / width));
+			mouse_event.mi.dy = (LONG) ((float) y * (65535.0f / height));
+			mouse_event.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE;
+			
+			SendInput(1, &mouse_event, sizeof(INPUT));
+		}
+		
+		mouse_event.mi.dx = mouse_event.mi.dy = mouse_event.mi.dwFlags = 0;
+		
+		if (flags & PTR_XFLAGS_DOWN)
+			mouse_event.mi.dwFlags |= MOUSEEVENTF_XDOWN;
+		else
+			mouse_event.mi.dwFlags |= MOUSEEVENTF_XUP;
+		
+		if (flags & PTR_XFLAGS_BUTTON1)
+			mouse_event.mi.mouseData = XBUTTON1;
+		else if (flags & PTR_XFLAGS_BUTTON2)
+			mouse_event.mi.mouseData = XBUTTON2;
+		
+		SendInput(1, &mouse_event, sizeof(INPUT));
+	}
+	else
+	{
+		wf_input_mouse_event(input, flags, x, y);
+	}
+}
+
+
+void wf_input_keyboard_event_dummy(rdpInput* input, UINT16 flags, UINT16 code)
+{
+}
+
+void wf_input_unicode_keyboard_event_dummy(rdpInput* input, UINT16 flags, UINT16 code)
+{
+}
+
+void wf_input_mouse_event_dummy(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y)
+{
+}
+
+void wf_input_extended_mouse_event_dummy(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y)
+{
+}
\ No newline at end of file
diff --git a/server/Mac/mf_input.h b/server/Mac/mf_input.h
new file mode 100644
index 000000000..09be9af48
--- /dev/null
+++ b/server/Mac/mf_input.h
@@ -0,0 +1,36 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * FreeRDP Mac OS X Server (Input)
+ *
+ * Copyright 2013 Corey Clayton <can.of.tuna@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MF_INPUT_H
+#define MF_INPUT_H
+
+#include "mf_interface.h"
+
+void mf_input_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code);
+void mf_input_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code);
+void mf_input_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
+void mf_input_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
+
+//dummy versions
+void mf_input_keyboard_event_dummy(rdpInput* input, UINT16 flags, UINT16 code);
+void mf_input_unicode_keyboard_event_dummy(rdpInput* input, UINT16 flags, UINT16 code);
+void mf_input_mouse_event_dummy(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
+void mf_input_extended_mouse_event_dummy(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
+
+#endif /* MF_INPUT_H */
\ No newline at end of file