diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
index 7f7189528..18f0ed7b4 100644
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -19,7 +19,8 @@ set(MODULE_NAME "freerdp-client")
 set(MODULE_PREFIX "FREERDP_CLIENT")
 
 set(${MODULE_PREFIX}_SRCS
-	client.c)
+	client.c
+	file.c)
 
 if(MSVC)
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
diff --git a/client/common/file.c b/client/common/file.c
new file mode 100644
index 000000000..ac85eb064
--- /dev/null
+++ b/client/common/file.c
@@ -0,0 +1,32 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * .rdp file
+ *
+ * Copyright 2012 Marc-Andre Moreau <marcandre.moreau@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 <freerdp/client/file.h>
+
+/**
+ * Remote Desktop Plus - Overview of .rdp file settings:
+ * http://www.donkz.nl/files/rdpsettings.html
+ *
+ * RDP Settings for Remote Desktop Services in Windows Server 2008 R2:
+ * http://technet.microsoft.com/en-us/library/ff393699/
+ */
diff --git a/include/freerdp/client/file.h b/include/freerdp/client/file.h
new file mode 100644
index 000000000..d9e7dbc5a
--- /dev/null
+++ b/include/freerdp/client/file.h
@@ -0,0 +1,134 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * .rdp file
+ *
+ * Copyright 2012 Marc-Andre Moreau <marcandre.moreau@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 FREERDP_CLIENT_RDP_FILE
+#define FREERDP_CLIENT_RDP_FILE
+
+#include <freerdp/freerdp.h>
+
+struct rdp_file
+{
+	DWORD UseMultiMon; /* use multimon */
+	DWORD ScreenModeId; /* screen mode id */
+	DWORD SpanMonitors; /* span monitors */
+	DWORD SmartSizing; /* smartsizing */
+	DWORD EnableSuperSpan; /* enablesuperpan */
+	DWORD SuperSpanAccelerationFactor; /* superpanaccelerationfactor */
+
+	DWORD DesktopWidth; /* desktopwidth */
+	DWORD DesktopHeight; /* desktopheight */
+	DWORD DesktopSizeId; /* desktop size id */
+	DWORD SessionBpp; /* session bpp */
+
+	DWORD Compression; /* compression */
+	DWORD KeyboardHook; /* keyboardhook */
+	DWORD DisableCtrlAltDel; /* disable ctrl+alt+del */
+
+	DWORD AudioMode; /* audiomode */
+	DWORD AudioQualityMode; /* audioqualitymode */
+	DWORD AudioCaptureMode; /* audiocapturemode */
+	DWORD VideoPlaybackMode; /* videoplaybackmode */
+
+	DWORD ConnectionType; /* connection type */
+
+	DWORD NetworkAutoDetect; /* networkautodetect */
+	DWORD BandwidthAutoDetect; /* bandwidthautodetect */
+
+	DWORD PinConnectionBar; /* pinconnectionbar */
+	DWORD DisplayConnectionBar; /* displayconnectionbar */
+
+	DWORD WorkspaceId; /* workspaceid */
+	DWORD EnableWorkspaceReconnect; /* enableworkspacereconnect */
+
+	DWORD DisableWallpaper; /* disable wallpaper */
+	DWORD AllowFontSmoothing; /* allow font smoothing */
+	DWORD AllowDesktopComposition; /* allow desktop composition */
+	DWORD DisableFullWindowDrag; /* disable full window drag */
+	DWORD DisableMenuAnims; /* disable menu anims */
+	DWORD DisableThemes; /* disable themes */
+	DWORD DisableCursorSetting; /* disable cursor setting */
+
+	DWORD BitmapCacheSize; /* bitmapcachesize */
+	DWORD BitmapCachePersistEnable; /* bitmapcachepersistenable */
+
+	LPSTR Username; /* username */
+	LPSTR Domain; /* domain */
+	PBYTE Password51; /* password 51 */
+
+	LPTSTR FullAddress; /* full address */
+	LPTSTR AlternateFullAddress; /* alternate full address */
+	DWORD ServerPort; /* server port */
+
+	DWORD RedirectDrives; /* redirectdrives */
+	DWORD RedirectPrinters; /* redirectprinters */
+	DWORD RedirectComPorts; /* redirectcomports */
+	DWORD RedirectSmartCards; /* redirectsmartcards */
+	DWORD RedirectClipboard; /* redirectclipboard */
+	DWORD RedirectPosDevices; /* redirectposdevices */
+	DWORD RedirectDirectX; /* redirectdirectx */
+	DWORD DisablePrinterRedirection; /* disableprinterredirection */
+	DWORD DisableClipboardRedirection; /* disableclipboardredirection */
+	LPSTR UsbDevicesToRedirect; /* usbdevicestoredirect */
+
+	DWORD ConnectToConsole; /* connect to console */
+	DWORD AdministrativeSession; /* administrative session */
+	DWORD AutoReconnectionEnabled; /* autoreconnection enabled */
+	DWORD AutoReconnectMaxRetries; /* autoreconnect max retries */
+
+	DWORD PublicMode; /* public mode */
+	DWORD AuthenticationLevel; /* authentication level */
+	DWORD PromptCredentialOnce; /* promptcredentialonce */
+	DWORD PromptForCredentials; /* prompt for credentials */
+	DWORD PromptForCredentialsOnce; /* promptcredentialonce */
+	DWORD NegotiateSecurityLayer; /* negotiate security layer */
+	DWORD EnableCredSSPSupport; /* enablecredsspsupport */
+	LPSTR LoadBalanceInfo; /* LoadBalanceInfo */
+
+	DWORD RemoteApplicationMode; /* remoteapplicationmode */
+	LPSTR RemoteApplicationName; /* remoteapplicationname */
+	LPSTR RemoteApplicationIcon; /* remoteapplicationicon */
+	LPSTR RemoteApplicationProgram; /* remoteapplicationprogram */
+	LPSTR RemoteApplicationFile; /* remoteapplicationfile */
+	LPSTR RemoteApplicationCmdLine; /* remoteapplicationcmdline */
+	DWORD RemoteApplicationExpandCmdLine; /* remoteapplicationexpandcmdline */
+	DWORD RemoteApplicationExpandWorkingDir; /* remoteapplicationexpandworkingdir */
+	DWORD DisableConnectionSharing; /* disableconnectionsharing */
+	DWORD DisableRemoteAppCapsCheck; /* disableremoteappcapscheck */
+
+	LPSTR AlternateShell; /* alternate shell */
+	LPSTR ShellWorkingDirectory; /* shell working directory */
+
+	LPSTR GatewayHostname; /* gatewayhostname */
+	LPSTR GatewayUsageMethod; /* gatewayusagemethod */
+	LPSTR GatewayProfileUsageMethod; /* gatewayprofileusagemethod */
+	LPSTR GatewayCredentialsSource; /* gatewaycredentialssource */
+
+	DWORD UseRedirectionServerName; /* use redirection server name */
+
+	DWORD RdgIsKdcProxy; /* rdgiskdcproxy */
+	DWORD KdcProxyName; /* kdcproxyname */
+
+	LPSTR DrivesToRedirect; /* drivestoredirect */
+	LPSTR DevicesToRedirect; /* devicestoredirect */
+	LPSTR WinPosStr; /* winposstr */
+};
+
+typedef struct rdp_file rdpFile;
+
+#endif /* FREERDP_CLIENT_RDP_FILE */