diff --git a/common/file.c b/common/file.c
index 05f243ca..f1ba5a87 100644
--- a/common/file.c
+++ b/common/file.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/file.h b/common/file.h
index c6ce0654..cab4304c 100644
--- a/common/file.h
+++ b/common/file.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/list.c b/common/list.c
index 0c27d596..2868d767 100644
--- a/common/list.c
+++ b/common/list.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/list.h b/common/list.h
index 2c0f9339..f92cc843 100644
--- a/common/list.h
+++ b/common/list.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/log.c b/common/log.c
index d8279600..ce0000aa 100644
--- a/common/log.c
+++ b/common/log.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/log.h b/common/log.h
index c83a34d3..7a38bf38 100644
--- a/common/log.h
+++ b/common/log.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/os_calls.h b/common/os_calls.h
index 5844df27..cba37588 100644
--- a/common/os_calls.h
+++ b/common/os_calls.h
@@ -27,252 +27,130 @@
 
 #include "arch.h"
 
-int APP_CC
-g_rm_temp_dir(void);
-int APP_CC
-g_mk_temp_dir(const char* app_name);
-void APP_CC
-g_init(const char* app_name);
-void APP_CC
-g_deinit(void);
-void* APP_CC
-g_malloc(int size, int zero);
-void APP_CC
-g_free(void* ptr);
-void DEFAULT_CC
-g_printf(const char *format, ...);
-void DEFAULT_CC
-g_sprintf(char* dest, const char* format, ...);
-void DEFAULT_CC
-g_snprintf(char* dest, int len, const char* format, ...);
-void DEFAULT_CC
-g_writeln(const char* format, ...);
-void DEFAULT_CC
-g_write(const char* format, ...);
-void APP_CC
-g_hexdump(char* p, int len);
-void APP_CC
-g_memset(void* ptr, int val, int size);
-void APP_CC
-g_memcpy(void* d_ptr, const void* s_ptr, int size);
-int APP_CC
-g_getchar(void);
-int APP_CC
-g_tcp_set_no_delay(int sck);
-int APP_CC
-g_tcp_set_keepalive(int sck);
-int APP_CC
-g_tcp_socket(void);
-int APP_CC
-g_tcp_local_socket(void);
-void APP_CC
-g_tcp_close(int sck);
-int APP_CC
-g_tcp_connect(int sck, const char* address, const char* port);
-int APP_CC
-g_tcp_local_connect(int sck, const char* port);
-int APP_CC
-g_tcp_force_send(int sck, char* data, int len);
-int APP_CC
-g_tcp_force_recv(int sck, char* data, int len);
-int APP_CC
-g_tcp_set_non_blocking(int sck);
-int APP_CC
-g_tcp_bind(int sck, const char *port);
-int APP_CC
-g_tcp_local_bind(int sck, const char* port);
-int APP_CC
-g_tcp_bind_address(int sck, const char* port, const char* address);
-int APP_CC
-g_tcp_listen(int sck);
-int APP_CC
-g_tcp_accept(int sck);
-int APP_CC
-g_tcp_recv(int sck, void* ptr, int len, int flags);
-int APP_CC
-g_tcp_send(int sck, const void* ptr, int len, int flags);
-int APP_CC
-g_tcp_last_error_would_block(int sck);
-int APP_CC
-g_tcp_socket_ok(int sck);
-int APP_CC
-g_tcp_can_send(int sck, int millis);
-int APP_CC
-g_tcp_can_recv(int sck, int millis);
-int APP_CC
-g_tcp_select(int sck1, int sck2);
-void APP_CC
-g_write_ip_address(int rcv_sck, char* ip_address, int bytes);
-void APP_CC
-g_sleep(int msecs);
-tbus APP_CC
-g_create_wait_obj(char* name);
-tbus APP_CC
-g_create_wait_obj_from_socket(tbus socket, int write);
-void APP_CC
-g_delete_wait_obj_from_socket(tbus wait_obj);
-int APP_CC
-g_set_wait_obj(tbus obj);
-int APP_CC
-g_reset_wait_obj(tbus obj);
-int APP_CC
-g_is_wait_obj_set(tbus obj);
-int APP_CC
-g_delete_wait_obj(tbus obj);
-int APP_CC
-g_close_wait_obj(tbus obj);
-int APP_CC
-g_obj_wait(tbus* read_objs, int rcount, tbus* write_objs, int wcount,
-           int mstimeout);
-void APP_CC
-g_random(char* data, int len);
-int APP_CC
-g_abs(int i);
-int APP_CC
-g_memcmp(const void* s1, const void* s2, int len);
-int APP_CC
-g_file_open(const char* file_name);
-int APP_CC
-g_file_open_ex(const char *file_name, int aread, int awrite,
-               int acreate, int atrunc);
-int APP_CC
-g_file_close(int fd);
-int APP_CC
-g_file_read(int fd, char* ptr, int len);
-int APP_CC
-g_file_write(int fd, char* ptr, int len);
-int APP_CC
-g_file_seek(int fd, int offset);
-int APP_CC
-g_file_lock(int fd, int start, int len);
-int APP_CC
-g_chmod_hex(const char* filename, int flags);
-int APP_CC
-g_chown(const char* name, int uid, int gid);
-int APP_CC
-g_mkdir(const char* dirname);
-char* APP_CC
-g_get_current_dir(char* dirname, int maxlen);
-int APP_CC
-g_set_current_dir(char* dirname);
-int APP_CC
-g_file_exist(const char* filename);
-int APP_CC
-g_directory_exist(const char* dirname);
-int APP_CC
-g_create_dir(const char* dirname);
-int APP_CC
-g_create_path(const char* path);
-int APP_CC
-g_remove_dir(const char* dirname);
-int APP_CC
-g_file_delete(const char* filename);
-int APP_CC
-g_file_get_size(const char* filename);
-int APP_CC
-g_strlen(const char* text);
-char* APP_CC
-g_strchr(const char* text, int c);
-char* APP_CC
-g_strcpy(char* dest, const char* src);
-char* APP_CC
-g_strncpy(char* dest, const char* src, int len);
-char* APP_CC
-g_strcat(char* dest, const char* src);
-char* APP_CC
-g_strdup(const char* in);
-char* APP_CC
-g_strndup(const char* in, const unsigned int maxlen);
-int APP_CC
-g_strcmp(const char* c1, const char* c2);
-int APP_CC
-g_strncmp(const char* c1, const char* c2, int len);
-int APP_CC
-g_strcasecmp(const char* c1, const char* c2);
-int APP_CC
-g_strncasecmp(const char* c1, const char* c2, int len);
-int APP_CC
-g_atoi(const char* str);
-int APP_CC
-g_htoi(char* str);
-int APP_CC
-g_pos(const char* str, const char* to_find);
-int APP_CC
-g_mbstowcs(twchar* dest, const char* src, int n);
-int APP_CC
-g_wcstombs(char* dest, const twchar* src, int n);
-int APP_CC
-g_strtrim(char* str, int trim_flags);
-long APP_CC
-g_load_library(char* in);
-int APP_CC
-g_free_library(long lib);
-void* APP_CC
-g_get_proc_address(long lib, const char* name);
-int APP_CC
-g_system(char* aexec);
-char* APP_CC
-g_get_strerror(void);
-int APP_CC
-g_get_errno(void);
-int APP_CC
-g_execvp(const char* p1, char* args[]);
-int APP_CC
-g_execlp3(const char* a1, const char* a2, const char* a3);
-void APP_CC
-g_signal_child_stop(void (*func)(int));
-void APP_CC
-g_signal_hang_up(void (*func)(int));
-void APP_CC
-g_signal_user_interrupt(void (*func)(int));
-void APP_CC
-g_signal_kill(void (*func)(int));
-void APP_CC
-g_signal_terminate(void (*func)(int));
-void APP_CC
-g_signal_pipe(void (*func)(int));
-void APP_CC
-g_signal_usr1(void (*func)(int));
-int APP_CC
-g_fork(void);
-int APP_CC
-g_setgid(int pid);
-int APP_CC
-g_initgroups(const char* user, int gid);
-int APP_CC
-g_getuid(void);
-int APP_CC
-g_getgid(void);
-int APP_CC
-g_setuid(int pid);
-int APP_CC
-g_waitchild(void);
-int APP_CC
-g_waitpid(int pid);
-void APP_CC
-g_clearenv(void);
-int APP_CC
-g_setenv(const char* name, const char* value, int rewrite);
-char* APP_CC
-g_getenv(const char* name);
-int APP_CC
-g_exit(int exit_code);
-int APP_CC
-g_getpid(void);
-int APP_CC
-g_sigterm(int pid);
-int APP_CC
-g_getuser_info(const char* username, int* gid, int* uid, char* shell,
-               char* dir, char* gecos);
-int APP_CC
-g_getgroup_info(const char* groupname, int* gid);
-int APP_CC
-g_check_user_in_group(const char* username, int gid, int* ok);
-int APP_CC
-g_time1(void);
-int APP_CC
-g_time2(void);
-int APP_CC
-g_time3(void);
+int APP_CC      g_rm_temp_dir(void);
+int APP_CC      g_mk_temp_dir(const char* app_name);
+void APP_CC     g_init(const char* app_name);
+void APP_CC     g_deinit(void);
+void* APP_CC    g_malloc(int size, int zero);
+void APP_CC     g_free(void* ptr);
+void DEFAULT_CC g_printf(const char *format, ...);
+void DEFAULT_CC g_sprintf(char* dest, const char* format, ...);
+void DEFAULT_CC g_snprintf(char* dest, int len, const char* format, ...);
+void DEFAULT_CC g_writeln(const char* format, ...);
+void DEFAULT_CC g_write(const char* format, ...);
+void APP_CC     g_hexdump(char* p, int len);
+void APP_CC     g_memset(void* ptr, int val, int size);
+void APP_CC     g_memcpy(void* d_ptr, const void* s_ptr, int size);
+int APP_CC      g_getchar(void);
+int APP_CC      g_tcp_set_no_delay(int sck);
+int APP_CC      g_tcp_set_keepalive(int sck);
+int APP_CC      g_tcp_socket(void);
+int APP_CC      g_tcp_local_socket(void);
+void APP_CC     g_tcp_close(int sck);
+int APP_CC      g_tcp_connect(int sck, const char* address, const char* port);
+int APP_CC      g_tcp_local_connect(int sck, const char* port);
+int APP_CC      g_tcp_force_send(int sck, char* data, int len);
+int APP_CC      g_tcp_force_recv(int sck, char* data, int len);
+int APP_CC      g_tcp_set_non_blocking(int sck);
+int APP_CC      g_tcp_bind(int sck, const char *port);
+int APP_CC      g_tcp_local_bind(int sck, const char* port);
+int APP_CC      g_tcp_bind_address(int sck, const char* port, const char* address);
+int APP_CC      g_tcp_listen(int sck);
+int APP_CC      g_tcp_accept(int sck);
+int APP_CC      g_tcp_recv(int sck, void* ptr, int len, int flags);
+int APP_CC      g_tcp_send(int sck, const void* ptr, int len, int flags);
+int APP_CC      g_tcp_last_error_would_block(int sck);
+int APP_CC      g_tcp_socket_ok(int sck);
+int APP_CC      g_tcp_can_send(int sck, int millis);
+int APP_CC      g_tcp_can_recv(int sck, int millis);
+int APP_CC      g_tcp_select(int sck1, int sck2);
+void APP_CC     g_write_ip_address(int rcv_sck, char* ip_address, int bytes);
+void APP_CC     g_sleep(int msecs);
+tbus APP_CC     g_create_wait_obj(char* name);
+tbus APP_CC     g_create_wait_obj_from_socket(tbus socket, int write);
+void APP_CC     g_delete_wait_obj_from_socket(tbus wait_obj);
+int APP_CC      g_set_wait_obj(tbus obj);
+int APP_CC      g_reset_wait_obj(tbus obj);
+int APP_CC      g_is_wait_obj_set(tbus obj);
+int APP_CC      g_delete_wait_obj(tbus obj);
+int APP_CC      g_close_wait_obj(tbus obj);
+int APP_CC      g_obj_wait(tbus* read_objs, int rcount, tbus* write_objs,
+                           int wcount,int mstimeout);
+void APP_CC     g_random(char* data, int len);
+int APP_CC      g_abs(int i);
+int APP_CC      g_memcmp(const void* s1, const void* s2, int len);
+int APP_CC      g_file_open(const char* file_name);
+int APP_CC      g_file_open_ex(const char *file_name, int aread, int awrite,
+                               int acreate, int atrunc);
+int APP_CC      g_file_close(int fd);
+int APP_CC      g_file_read(int fd, char* ptr, int len);
+int APP_CC      g_file_write(int fd, char* ptr, int len);
+int APP_CC      g_file_seek(int fd, int offset);
+int APP_CC      g_file_lock(int fd, int start, int len);
+int APP_CC      g_chmod_hex(const char* filename, int flags);
+int APP_CC      g_chown(const char* name, int uid, int gid);
+int APP_CC      g_mkdir(const char* dirname);
+char* APP_CC    g_get_current_dir(char* dirname, int maxlen);
+int APP_CC      g_set_current_dir(char* dirname);
+int APP_CC      g_file_exist(const char* filename);
+int APP_CC      g_directory_exist(const char* dirname);
+int APP_CC      g_create_dir(const char* dirname);
+int APP_CC      g_create_path(const char* path);
+int APP_CC      g_remove_dir(const char* dirname);
+int APP_CC      g_file_delete(const char* filename);
+int APP_CC      g_file_get_size(const char* filename);
+int APP_CC      g_strlen(const char* text);
+char* APP_CC    g_strchr(const char* text, int c);
+char* APP_CC    g_strcpy(char* dest, const char* src);
+char* APP_CC    g_strncpy(char* dest, const char* src, int len);
+char* APP_CC    g_strcat(char* dest, const char* src);
+char* APP_CC    g_strdup(const char* in);
+char* APP_CC    g_strndup(const char* in, const unsigned int maxlen);
+int APP_CC      g_strcmp(const char* c1, const char* c2);
+int APP_CC      g_strncmp(const char* c1, const char* c2, int len);
+int APP_CC      g_strcasecmp(const char* c1, const char* c2);
+int APP_CC      g_strncasecmp(const char* c1, const char* c2, int len);
+int APP_CC      g_atoi(const char* str);
+int APP_CC      g_htoi(char* str);
+int APP_CC      g_pos(const char* str, const char* to_find);
+int APP_CC      g_mbstowcs(twchar* dest, const char* src, int n);
+int APP_CC      g_wcstombs(char* dest, const twchar* src, int n);
+int APP_CC      g_strtrim(char* str, int trim_flags);
+long APP_CC     g_load_library(char* in);
+int APP_CC      g_free_library(long lib);
+void* APP_CC    g_get_proc_address(long lib, const char* name);
+int APP_CC      g_system(char* aexec);
+char* APP_CC    g_get_strerror(void);
+int APP_CC      g_get_errno(void);
+int APP_CC      g_execvp(const char* p1, char* args[]);
+int APP_CC      g_execlp3(const char* a1, const char* a2, const char* a3);
+void APP_CC     g_signal_child_stop(void (*func)(int));
+void APP_CC     g_signal_hang_up(void (*func)(int));
+void APP_CC     g_signal_user_interrupt(void (*func)(int));
+void APP_CC     g_signal_kill(void (*func)(int));
+void APP_CC     g_signal_terminate(void (*func)(int));
+void APP_CC     g_signal_pipe(void (*func)(int));
+void APP_CC     g_signal_usr1(void (*func)(int));
+int APP_CC      g_fork(void);
+int APP_CC      g_setgid(int pid);
+int APP_CC      g_initgroups(const char* user, int gid);
+int APP_CC      g_getuid(void);
+int APP_CC      g_getgid(void);
+int APP_CC      g_setuid(int pid);
+int APP_CC      g_waitchild(void);
+int APP_CC      g_waitpid(int pid);
+void APP_CC     g_clearenv(void);
+int APP_CC      g_setenv(const char* name, const char* value, int rewrite);
+char* APP_CC    g_getenv(const char* name);
+int APP_CC      g_exit(int exit_code);
+int APP_CC      g_getpid(void);
+int APP_CC      g_sigterm(int pid);
+int APP_CC      g_getuser_info(const char* username, int* gid, int* uid, char* shell,
+                               char* dir, char* gecos);
+int APP_CC      g_getgroup_info(const char* groupname, int* gid);
+int APP_CC      g_check_user_in_group(const char* username, int gid, int* ok);
+int APP_CC      g_time1(void);
+int APP_CC      g_time2(void);
+int APP_CC      g_time3(void);
 
 #endif
diff --git a/common/parse.h b/common/parse.h
index 49c2fa23..3d6a5058 100644
--- a/common/parse.h
+++ b/common/parse.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/ssl_calls.h b/common/ssl_calls.h
index f4a63155..3b59537a 100644
--- a/common/ssl_calls.h
+++ b/common/ssl_calls.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/thread_calls.c b/common/thread_calls.c
index ad944d02..b571fb62 100644
--- a/common/thread_calls.c
+++ b/common/thread_calls.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/thread_calls.h b/common/thread_calls.h
index 0c853d22..9d2c4a11 100644
--- a/common/thread_calls.h
+++ b/common/thread_calls.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/trans.c b/common/trans.c
index c287d310..e862249e 100644
--- a/common/trans.c
+++ b/common/trans.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/trans.h b/common/trans.h
index 1133477a..8daa980a 100644
--- a/common/trans.h
+++ b/common/trans.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h
index d6ea3a96..b978d2de 100644
--- a/common/xrdp_constants.h
+++ b/common/xrdp_constants.h
@@ -3,7 +3,7 @@
  * Miscellaneous protocol constants
  *
  * Copyright (C) Matthew Chapman 1999-2008
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  * Copyright (C) Kevin Zhou 2012
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/common/xrdp_rail.h b/common/xrdp_rail.h
index deed3a9e..89cd9f95 100644
--- a/common/xrdp_rail.h
+++ b/common/xrdp_rail.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2012
+ * Copyright (C) Jay Sorg 2012-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/configure.ac b/configure.ac
index 92655612..a2a80aa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([xrdp], [0.6.0], [xrdp-devel@lists.sourceforge.net])
-AM_CONFIG_HEADER(config_ac.h:config_ac-h.in)
+AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
 AM_INIT_AUTOMAKE([1.6 foreign])
 AC_PROG_CC
 AC_C_CONST
diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c
index 3da32937..23cf5b09 100644
--- a/libxrdp/libxrdp.c
+++ b/libxrdp/libxrdp.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/libxrdp.h b/libxrdp/libxrdp.h
index 6a4ac17e..d31edbb4 100644
--- a/libxrdp/libxrdp.h
+++ b/libxrdp/libxrdp.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2010
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/libxrdpinc.h b/libxrdp/libxrdpinc.h
index 9eac9733..b971204e 100644
--- a/libxrdp/libxrdpinc.h
+++ b/libxrdp/libxrdpinc.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2010
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/xrdp_bitmap_compress.c b/libxrdp/xrdp_bitmap_compress.c
index 87538450..28a08e77 100644
--- a/libxrdp/xrdp_bitmap_compress.c
+++ b/libxrdp/xrdp_bitmap_compress.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/xrdp_channel.c b/libxrdp/xrdp_channel.c
index 6f40b751..198b876b 100644
--- a/libxrdp/xrdp_channel.c
+++ b/libxrdp/xrdp_channel.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2006-2012
+ * Copyright (C) Jay Sorg 2006-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/xrdp_fastpath.c b/libxrdp/xrdp_fastpath.c
index 35d90407..10f844e5 100644
--- a/libxrdp/xrdp_fastpath.c
+++ b/libxrdp/xrdp_fastpath.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2012
+ * Copyright (C) Jay Sorg 2012-2013
  * Copyright (C) Kevin Zhou 2012
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libxrdp/xrdp_iso.c b/libxrdp/xrdp_iso.c
index 8dedc131..d851c1bb 100644
--- a/libxrdp/xrdp_iso.c
+++ b/libxrdp/xrdp_iso.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/xrdp_jpeg_compress.c b/libxrdp/xrdp_jpeg_compress.c
index f8681e2b..82a816a0 100644
--- a/libxrdp/xrdp_jpeg_compress.c
+++ b/libxrdp/xrdp_jpeg_compress.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/xrdp_mcs.c b/libxrdp/xrdp_mcs.c
index dbcb0955..4bf3d025 100644
--- a/libxrdp/xrdp_mcs.c
+++ b/libxrdp/xrdp_mcs.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -829,8 +829,8 @@ void close_rdp_socket(struct xrdp_mcs *self)
     if(self->iso_layer->tcp_layer)
     {
         if(self->iso_layer->tcp_layer->trans)
-        {	    
-            g_tcp_close(self->iso_layer->tcp_layer->trans->sck);	    
+        {
+            g_tcp_close(self->iso_layer->tcp_layer->trans->sck);
             self->iso_layer->tcp_layer->trans->sck = 0 ;
             g_writeln("xrdp_mcs_disconnect - socket closed");
             return ;
diff --git a/libxrdp/xrdp_mppc_enc.c b/libxrdp/xrdp_mppc_enc.c
index f94b7e6a..05aa6bb6 100644
--- a/libxrdp/xrdp_mppc_enc.c
+++ b/libxrdp/xrdp_mppc_enc.c
@@ -2,8 +2,8 @@
  * FreeRDP: A Remote Desktop Protocol Implementation
  * Implements Microsoft Point to Point Compression (MPPC) protocol
  *
- * Copyright 2012 Laxmikant Rashinkar <LK.Rashinkar@gmail.com>
- * Copyright 2012 Jay Sorg <jay.sorg@gmail.com>
+ * Copyright 2012-2013 Laxmikant Rashinkar <LK.Rashinkar@gmail.com>
+ * Copyright 2012-2013 Jay Sorg <jay.sorg@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c
index 7a17759c..aa399004 100644
--- a/libxrdp/xrdp_orders.c
+++ b/libxrdp/xrdp_orders.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/xrdp_orders_rail.c b/libxrdp/xrdp_orders_rail.c
index 3ac0fd2a..bd91b543 100644
--- a/libxrdp/xrdp_orders_rail.c
+++ b/libxrdp/xrdp_orders_rail.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2012
+ * Copyright (C) Jay Sorg 2012-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index 2cc2d424..54d5d0de 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libxrdp/xrdp_surface.c b/libxrdp/xrdp_surface.c
index 34ab9f48..701ee3b5 100644
--- a/libxrdp/xrdp_surface.c
+++ b/libxrdp/xrdp_surface.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2012
+ * Copyright (C) Jay Sorg 2012-2013
  * Copyright (C) Kevin Zhou 2012
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libxrdp/xrdp_tcp.c b/libxrdp/xrdp_tcp.c
index 807797a1..473f3deb 100644
--- a/libxrdp/xrdp_tcp.c
+++ b/libxrdp/xrdp_tcp.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004 - 2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/mc/mc.c b/mc/mc.c
index b585915c..c1ec958c 100644
--- a/mc/mc.c
+++ b/mc/mc.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/mc/mc.h b/mc/mc.h
index 1246326d..684219c7 100644
--- a/mc/mc.h
+++ b/mc/mc.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp.c b/rdp/rdp.c
index f10b2760..abbbab73 100644
--- a/rdp/rdp.c
+++ b/rdp/rdp.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp.h b/rdp/rdp.h
index 727d6c3e..9a755a38 100644
--- a/rdp/rdp.h
+++ b/rdp/rdp.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp_bitmap.c b/rdp/rdp_bitmap.c
index adba5f6f..0963588f 100644
--- a/rdp/rdp_bitmap.c
+++ b/rdp/rdp_bitmap.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp_iso.c b/rdp/rdp_iso.c
index 09c874b6..65721658 100644
--- a/rdp/rdp_iso.c
+++ b/rdp/rdp_iso.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp_lic.c b/rdp/rdp_lic.c
index ce9a0624..e3ff3a7e 100644
--- a/rdp/rdp_lic.c
+++ b/rdp/rdp_lic.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp_mcs.c b/rdp/rdp_mcs.c
index 3f5162f3..55067b1f 100644
--- a/rdp/rdp_mcs.c
+++ b/rdp/rdp_mcs.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp_orders.c b/rdp/rdp_orders.c
index b686c925..0e4d42ad 100644
--- a/rdp/rdp_orders.c
+++ b/rdp/rdp_orders.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp_rdp.c b/rdp/rdp_rdp.c
index c42d6e5f..973b8fe9 100644
--- a/rdp/rdp_rdp.c
+++ b/rdp/rdp_rdp.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp_sec.c b/rdp/rdp_sec.c
index bd0fe349..2622ad76 100644
--- a/rdp/rdp_sec.c
+++ b/rdp/rdp_sec.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rdp/rdp_tcp.c b/rdp/rdp_tcp.c
index f3c990ad..a919259e 100644
--- a/rdp/rdp_tcp.c
+++ b/rdp/rdp_tcp.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/access.c b/sesman/access.c
index 692575e5..1ba22df4 100644
--- a/sesman/access.c
+++ b/sesman/access.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/access.h b/sesman/access.h
index d53c65ad..2da6bb88 100644
--- a/sesman/access.h
+++ b/sesman/access.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c
index 3d6e3e3c..48936910 100644
--- a/sesman/chansrv/chansrv_fuse.c
+++ b/sesman/chansrv/chansrv_fuse.c
@@ -68,7 +68,7 @@ int xfuse_file_contents_range(int stream_id, char *data, int data_bytes)     {}
 int xfuse_file_contents_size(int stream_id, int file_size)                   {}
 int xfuse_add_clip_dir_item(char *filename, int flags, int size, int lindex) {}
 int xfuse_create_share(tui32 device_id, char *dirname)                       {}
-void xfuse_devredir_cb_open_file(void *vp, tui32 DeviceId, tui32 FileId)     {}
+void xfuse_devredir_cb_open_file(void *vp, tui32 IoStatus, tui32 DeviceId, tui32 FileId)     {}
 void xfuse_devredir_cb_write_file(void *vp, char *buf, size_t length)        {}
 void xfuse_devredir_cb_read_file(void *vp, char *buf, size_t length)         {}
 void xfuse_devredir_cb_enum_dir(void *vp, struct xrdp_inode *xinode)         {}
@@ -1334,134 +1334,6 @@ static void xfuse_enum_dir(fuse_req_t req, fuse_ino_t ino, size_t size,
  * Add a file or directory to xrdp file system
  *****************************************************************************/
 
-/* LK_TODO delete this after testing */
-#if 0
-void ___xfuse_devredir_cb_enum_dir(void *vp, struct xrdp_inode *xinode)
-{
-    XFUSE_INFO    *fip = (XFUSE_INFO *) vp;
-    XRDP_INODE    *xip = NULL;
-
-    log_debug("<<<<<< entered");
-
-    if ((fip == NULL) || (xinode == NULL))
-    {
-        log_error("fip or xinode are NULL");
-        printf("RASH_TODO: fip or xinode are NULL - leaving\n");
-        return;
-    }
-
-    log_debug("req=%p", fip->req);
-
-    /* do we have a valid inode? */
-    if (!xfuse_is_inode_valid(fip->inode))
-    {
-        log_error("inode %d is not valid", fip->inode);
-        printf("RASH_TODO: inode %d is not valid - leaving\n", (tui32) fip->inode);
-        return;
-    }
-
-    /* if filename is . or .. don't add it */
-    if ((strcmp(xinode->name, ".") == 0) || (strcmp(xinode->name, "..") == 0))
-    {
-        free(xinode);
-        printf("RASH_TODO: not adding ./.. - leaving\n");
-        return;
-    }
-
-// LK_TODO
-#if 0
-    /* we have a parent inode and a dir name; what we need is the xinode */
-    /* that matches the parent inode and the dir name                    */
-    target_inode = xfuse_get_inode_from_pinode_name(fip->inode, fip->name);
-    if (target_inode == 0)
-    {
-        log_debug("did not find entry with inode=%d name=%s",
-                  fip->inode, fip->name);
-        return;
-    }
-#endif
-
-    if ((xip = xfuse_get_inode_from_pinode_name(fip->inode, xinode->name)) != NULL)
-    {
-        log_debug("inode=%d name=%s already exists in xrdp_fs; not adding it",
-                  fip->inode, xinode->name);
-        free(xinode);
-        xinode = xip;
-        goto update_fuse;
-    }
-
-    xinode->parent_inode = fip->inode;
-    xinode->inode = g_xrdp_fs.next_node++;
-    xinode->uid = getuid();
-    xinode->gid = getgid();
-    xinode->device_id = fip->device_id;
-
-    g_xrdp_fs.num_entries++;
-
-    /* insert it in xrdp fs and update lookup count */
-    g_xrdp_fs.inode_table[xinode->inode] = xinode;
-    g_xrdp_fs.inode_table[fip->inode]->nentries;
-    xfuse_update_xrdpfs_size();
-
-update_fuse:
-
-#if 1
-    /* let FUSE know about this entry */
-    if (fip->invoke_fuse)
-    {
-        struct dirbuf b;
-
-        memset(&b, 0, sizeof(struct dirbuf));
-
-        /* RASH_TODO if we are not using dirbuf, change this code */
-        if (fip->dirbuf == NULL)
-        {
-            fip->dirbuf = calloc(1, sizeof(struct dirbuf));
-            xfuse_dirbuf_add(fip->req, &b, ".", xinode->inode);
-            xfuse_dirbuf_add(fip->req, &b, "..", xinode->parent_inode);
-        }
-
-        xfuse_dirbuf_add(fip->req, &b, xinode->name, xinode->inode);
-
-        if (fip->off < b.size)
-        {
-            printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): req=%p off=%d\n",
-                   fip->req, (tui32) fip->off);
-
-            printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): dumping req b4\n\n");
-            g_hexdump((char *) fip->req, 128);
-
-            printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): dumping buf b4\n\n");
-            g_hexdump(b.p, b.size);
-
-            printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): calling fuse\n");
-
-            fuse_reply_buf(fip->req, b.p, b.size);
-
-            printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): calling fuse...done\n");
-
-            printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): dumping req aft\n\n");
-            g_hexdump((char *) fip->req, 128);
-
-            printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): dumping buf aft\n\n");
-            g_hexdump(b.p, b.size);
-        }
-        else
-        {
-            printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): calling fuse with NULL\n");
-            fuse_reply_buf(fip->req, NULL, 0);
-            printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): calling fuse with NULL...done\n");
-        }
-
-        log_debug("added inode=%d name=%s to FUSE", (tui32) xinode->inode, xinode->name);
-    }
-#endif
-
-    log_debug("leaving");
-    printf("RASH_TODO: xfuse_devredir_cb_enum_dir(): leaving\n");
-}
-#endif
-
 void xfuse_devredir_cb_enum_dir(void *vp, struct xrdp_inode *xinode)
 {
     XFUSE_INFO    *fip = (XFUSE_INFO *) vp;
@@ -1715,7 +1587,8 @@ done:
     free(fip);
 }
 
-void xfuse_devredir_cb_open_file(void *vp, tui32 DeviceId, tui32 FileId)
+void xfuse_devredir_cb_open_file(void *vp, tui32 IoStatus, tui32 DeviceId,
+                                 tui32 FileId)
 {
     XFUSE_HANDLE *fh;
     XRDP_INODE   *xinode;
@@ -1730,14 +1603,39 @@ void xfuse_devredir_cb_open_file(void *vp, tui32 DeviceId, tui32 FileId)
     log_debug("+++ XFUSE_INFO=%p XFUSE_INFO->fi=%p DeviceId=%d FileId=%d",
               fip, fip->fi, DeviceId, FileId);
 
+    if (IoStatus != 0)
+    {
+        if (!fip->invoke_fuse)
+            goto done;
+
+        switch (IoStatus)
+        {
+        case 0xC0000022:
+            fuse_reply_err(fip->req, EACCES);
+            break;
+
+        case 0xC0000033:
+        case 0xC0000034:
+            fuse_reply_err(fip->req, ENOENT);
+            break;
+
+        default:
+            fuse_reply_err(fip->req, EIO);
+            break;
+        }
+
+        goto done;
+    }
+
     if (fip->fi != NULL)
     {
         if ((fh = calloc(1, sizeof(XFUSE_HANDLE))) == NULL)
         {
             log_error("system out of memory");
-            free(fip);
             if (fip->invoke_fuse)
                 fuse_reply_err(fip->req, ENOMEM);
+
+            free(fip);
             return;
         }
 
diff --git a/sesman/chansrv/chansrv_fuse.h b/sesman/chansrv/chansrv_fuse.h
index 912a0b22..364c1d94 100644
--- a/sesman/chansrv/chansrv_fuse.h
+++ b/sesman/chansrv/chansrv_fuse.h
@@ -58,7 +58,7 @@ int xfuse_add_clip_dir_item(char *filename, int flags, int size, int lindex);
 /* functions that are invoked from devredir */
 void xfuse_devredir_cb_enum_dir(void *vp, struct xrdp_inode *xinode);
 void xfuse_devredir_cb_enum_dir_done(void *vp, tui32 IoStatus);
-void xfuse_devredir_cb_open_file(void *vp, tui32 DeviceId, tui32 FileId);
+void xfuse_devredir_cb_open_file(void *vp, tui32 IoStatus, tui32 DeviceId, tui32 FileId);
 void xfuse_devredir_cb_read_file(void *vp, char *buf, size_t length);
 void xfuse_devredir_cb_rmdir_or_file(void *vp, tui32 IoStatus);
 void xfuse_devredir_cb_rename_file(void *vp, tui32 IoStatus);
diff --git a/sesman/chansrv/devredir.c b/sesman/chansrv/devredir.c
index 77f1569f..067738ac 100644
--- a/sesman/chansrv/devredir.c
+++ b/sesman/chansrv/devredir.c
@@ -432,8 +432,8 @@ int dev_redir_send_drive_create_request(tui32 device_id, char *path,
     log_debug("DesiredAccess=0x%x CreateDisposition=0x%x CreateOptions=0x%x",
               DesiredAccess, CreateDisposition, CreateOptions);
 
-    /* to store path as unicode */
-    len = strlen(path) * 2 + 2;
+    /* path in unicode needs this much space */
+    len = ((g_mbstowcs(NULL, path, 0) * sizeof(twchar)) / 2) + 2;
 
     xstream_new(s, 1024 + len);
 
@@ -517,7 +517,8 @@ void dev_redir_send_drive_dir_request(IRP *irp, tui32 device_id,
         if (Path == NULL)
             return;
 
-        path_len = strlen(Path) * 2 + 2;
+        /* Path in unicode needs this much space */
+        path_len = ((g_mbstowcs(NULL, Path, 0) * sizeof(twchar)) / 2) + 2;
         devredir_cvt_to_unicode(upath, Path);
     }
 
@@ -717,8 +718,6 @@ void dev_redir_proc_device_iocompletion(struct stream *s)
     xstream_rd_u32_le(s, CompletionId);
     xstream_rd_u32_le(s, IoStatus);
 
-    /* LK_TODO need to check for IoStatus */
-
     log_debug("entered: IoStatus=0x%x CompletionId=%d", IoStatus, CompletionId);
 
     if ((irp = devredir_irp_find(CompletionId)) == NULL)
@@ -762,12 +761,14 @@ void dev_redir_proc_device_iocompletion(struct stream *s)
 
     case CID_CREATE_OPEN_REQ:
         xstream_rd_u32_le(s, irp->FileId);
+
         log_debug("got CID_CREATE_OPEN_REQ IoStatus=0x%x FileId=%d",
                   IoStatus, irp->FileId);
+
         fuse_data = devredir_fuse_data_dequeue(irp);
-        xfuse_devredir_cb_open_file(fuse_data->data_ptr,
+        xfuse_devredir_cb_open_file(fuse_data->data_ptr, IoStatus,
                                     DeviceId, irp->FileId);
-        if (irp->type == S_IFDIR)
+        if ((irp->type == S_IFDIR) || (IoStatus != NT_STATUS_SUCCESS))
             devredir_irp_delete(irp);
         break;
 
@@ -1411,29 +1412,64 @@ void devredir_cvt_slash(char *path)
 
 void devredir_cvt_to_unicode(char *unicode, char *path)
 {
-    int len = strlen(path);
-    int i;
-    int j = 0;
+    char *dest;
+    char *src;
+    int   rv;
+    int   i;
+
+    rv = g_mbstowcs((twchar *) unicode, path, strlen(path));
 
-    for (i = 0; i < len; i++)
+    /* unicode is typically 4 bytes, but microsoft only uses 2 bytes */
+
+    src  = unicode + sizeof(twchar); /* skip 1st unicode char        */
+    dest = unicode + 2;              /* first char already in  place */
+
+    for (i = 1; i < rv; i++)
     {
-        unicode[j++] = path[i];
-        unicode[j++] = 0x00;
+        *dest++ = *src++;
+        *dest++ = *src++;
+        src += 2;
     }
-    unicode[j++] = 0x00;
-    unicode[j++] = 0x00;
+
+    *dest++ = 0;
+    *dest++ = 0;
 }
 
 void devredir_cvt_from_unicode_len(char *path, char *unicode, int len)
 {
-    int i;
-    int j;
+    char *dest;
+    char *dest_saved;
+    char *src;
+    int   rv;
+    int   i;
+    int   bytes_to_alloc;
+    int   max_bytes;
 
-    for (i = 0, j = 0; i < len; i += 2)
+    bytes_to_alloc = (((len / 2) * sizeof(twchar)) + sizeof(twchar));
+
+    src = unicode;
+    dest = g_malloc(bytes_to_alloc, 1);
+    dest_saved = dest;
+
+    for (i = 0; i < len; i += 2)
+    {
+        *dest++ = *src++;
+        *dest++ = *src++;
+        dest += 2;
+    }
+    *dest++ = 0;
+    *dest++ = 0;
+    *dest++ = 0;
+    *dest++ = 0;
+
+    max_bytes = wcstombs(NULL, (wchar_t *) dest_saved, 0);
+    if (max_bytes > 0)
     {
-        path[j++] = unicode[i];
+        rv = wcstombs(path, (wchar_t *) dest_saved, max_bytes);
+        path[max_bytes] = 0;
     }
-    path[j] = 0;
+
+    g_free(dest_saved);
 }
 
 int dev_redir_string_ends_with(char *string, char c)
@@ -1518,7 +1554,7 @@ void devredir_proc_cid_rename_file(IRP *irp, tui32 IoStatus)
     struct stream *s;
     int            bytes;
     int            sblen; /* SetBuffer length */
-    int            flen;  /*FileNameLength    */
+    int            flen;  /* FileNameLength   */
 
 
     if (IoStatus != NT_STATUS_SUCCESS)
@@ -1535,25 +1571,26 @@ void devredir_proc_cid_rename_file(IRP *irp, tui32 IoStatus)
         return;
     }
 
-    xstream_new(s, 1024);
+    /* Path in unicode needs this much space */
+    flen = ((g_mbstowcs(NULL, irp->gen_buf, 0) * sizeof(twchar)) / 2) + 2;
+    sblen = 6 + flen;
+
+    xstream_new(s, 1024 + flen);
 
     irp->completion_type = CID_RENAME_FILE_RESP;
     devredir_insert_DeviceIoRequest(s, irp->DeviceId, irp->FileId,
                                     irp->CompletionId,
                                     IRP_MJ_SET_INFORMATION, 0);
 
-    flen = strlen(irp->gen_buf) * 2 + 2;
-    sblen = 6 + flen;
-
     xstream_wr_u32_le(s, FileRenameInformation);
-    xstream_wr_u32_le(s, sblen);     /* Length          */
-    xstream_seek(s, 24);             /* padding         */
-    xstream_wr_u8(s, 1);             /* ReplaceIfExists */
-    xstream_wr_u8(s, 0);             /* RootDirectory   */
-    xstream_wr_u32_le(s, flen);      /* FileNameLength  */
+    xstream_wr_u32_le(s, sblen);     /* number of bytes after padding */
+    xstream_seek(s, 24);             /* padding                       */
+    xstream_wr_u8(s, 1);             /* ReplaceIfExists               */
+    xstream_wr_u8(s, 0);             /* RootDirectory                 */
+    xstream_wr_u32_le(s, flen);      /* FileNameLength                */
 
     /* filename in unicode */
-    devredir_cvt_to_unicode(s->p, irp->gen_buf);
+    devredir_cvt_to_unicode(s->p, irp->gen_buf); /* UNICODE_TODO */
     xstream_seek(s, flen);
 
     /* send to client */
diff --git a/sesman/config.c b/sesman/config.c
index e2131c14..c7c3de24 100644
--- a/sesman/config.c
+++ b/sesman/config.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -289,7 +289,7 @@ config_read_security(int file, struct config_security *sc,
         if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_ALWAYSGROUPCHECK))
         {
             sc->ts_always_group_check = text2bool((char *)list_get_item(param_v, i));
-        }	
+        }
     }
 
     /* printing security config */
@@ -297,7 +297,7 @@ config_read_security(int file, struct config_security *sc,
     g_printf("\tAllowRootLogin:       %i\r\n", sc->allow_root);
     g_printf("\tMaxLoginRetry:        %i\r\n", sc->login_retry);
     g_printf("\tAlwaysGroupCheck:     %i\r\n", sc->ts_always_group_check);
-    
+
     if (sc->ts_users_enable)
     {
         g_printf("\tTSUsersGroup:         %i\r\n", sc->ts_users);
diff --git a/sesman/config.h b/sesman/config.h
index 263975b3..b011ca9b 100644
--- a/sesman/config.h
+++ b/sesman/config.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/env.c b/sesman/env.c
index 9f35f368..72a67642 100644
--- a/sesman/env.c
+++ b/sesman/env.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,6 +104,7 @@ env_set_user(char *username, char *passwd_file, int display)
             g_set_current_dir(pw_dir);
             g_sprintf(text, ":%d.0", display);
             g_setenv("DISPLAY", text, 1);
+            g_setenv("LANG", "en_US.UTF-8", 1);
 
             if (passwd_file != 0)
             {
diff --git a/sesman/env.h b/sesman/env.h
index c185ae30..e70bfe6a 100644
--- a/sesman/env.h
+++ b/sesman/env.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/lock.c b/sesman/lock.c
index dd78ebbe..6337a541 100644
--- a/sesman/lock.c
+++ b/sesman/lock.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/lock.h b/sesman/lock.h
index 0b7c905f..1fd968ef 100644
--- a/sesman/lock.h
+++ b/sesman/lock.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp.c b/sesman/scp.c
index db97fda5..076d57b2 100644
--- a/sesman/scp.c
+++ b/sesman/scp.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp.h b/sesman/scp.h
index c4f3de3a..1cdfbc4f 100644
--- a/sesman/scp.h
+++ b/sesman/scp.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c
index 6ecb47b1..aeaa22ee 100644
--- a/sesman/scp_v0.c
+++ b/sesman/scp_v0.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v0.h b/sesman/scp_v0.h
index e5c2f576..8aa6f401 100644
--- a/sesman/scp_v0.h
+++ b/sesman/scp_v0.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v1.c b/sesman/scp_v1.c
index d3f0ab7f..12115929 100644
--- a/sesman/scp_v1.c
+++ b/sesman/scp_v1.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v1.h b/sesman/scp_v1.h
index 0d224129..a1d718a7 100644
--- a/sesman/scp_v1.h
+++ b/sesman/scp_v1.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v1_mng.c b/sesman/scp_v1_mng.c
index 9d1da0f5..2624644a 100644
--- a/sesman/scp_v1_mng.c
+++ b/sesman/scp_v1_mng.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v1_mng.h b/sesman/scp_v1_mng.h
index 0317ba5f..74d4e392 100644
--- a/sesman/scp_v1_mng.h
+++ b/sesman/scp_v1_mng.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sesman.c b/sesman/sesman.c
index 50652b37..4a294a5e 100644
--- a/sesman/sesman.c
+++ b/sesman/sesman.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sesman.h b/sesman/sesman.h
index 2eb70df9..71688987 100644
--- a/sesman/sesman.h
+++ b/sesman/sesman.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/session.c b/sesman/session.c
index 3a200f50..888604da 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/session.h b/sesman/session.h
index b62b2aee..4329df12 100644
--- a/sesman/session.h
+++ b/sesman/session.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sessvc/sessvc.c b/sesman/sessvc/sessvc.c
index 2344229c..b3e42178 100644
--- a/sesman/sessvc/sessvc.c
+++ b/sesman/sessvc/sessvc.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sig.c b/sesman/sig.c
index b8f320f1..7bb881ce 100644
--- a/sesman/sig.c
+++ b/sesman/sig.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sig.h b/sesman/sig.h
index ac648da0..17f8f917 100644
--- a/sesman/sig.h
+++ b/sesman/sig.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/thread.c b/sesman/thread.c
index a33b93d9..0ed1182a 100644
--- a/sesman/thread.c
+++ b/sesman/thread.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/thread.h b/sesman/thread.h
index 9dcb53b4..83a4b63d 100644
--- a/sesman/thread.h
+++ b/sesman/thread.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/dis.c b/sesman/tools/dis.c
index 52400847..adcc3ee0 100644
--- a/sesman/tools/dis.c
+++ b/sesman/tools/dis.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/sesrun.c b/sesman/tools/sesrun.c
index 5ad3b5cc..7ac10102 100644
--- a/sesman/tools/sesrun.c
+++ b/sesman/tools/sesrun.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/tcp.c b/sesman/tools/tcp.c
index c8d01e96..2f7ae948 100644
--- a/sesman/tools/tcp.c
+++ b/sesman/tools/tcp.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/tcp.h b/sesman/tools/tcp.h
index 2fd7963e..6697c662 100644
--- a/sesman/tools/tcp.h
+++ b/sesman/tools/tcp.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/xcon.c b/sesman/tools/xcon.c
index bb715054..80832276 100644
--- a/sesman/tools/xcon.c
+++ b/sesman/tools/xcon.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/verify_user.c b/sesman/verify_user.c
index 85e614d3..98d3dd32 100644
--- a/sesman/verify_user.c
+++ b/sesman/verify_user.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/verify_user_kerberos.c b/sesman/verify_user_kerberos.c
index fc0d4aa2..a6480f56 100644
--- a/sesman/verify_user_kerberos.c
+++ b/sesman/verify_user_kerberos.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/verify_user_pam.c b/sesman/verify_user_pam.c
index b7a7bef7..e53f72d5 100644
--- a/sesman/verify_user_pam.c
+++ b/sesman/verify_user_pam.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ get_service_name(char *service_name)
 }
 
 /******************************************************************************/
-/* returns long, zero is no go 
+/* returns long, zero is no go
  Stores the detailed error code in the errorcode variable*/
 
 long DEFAULT_CC
@@ -138,7 +138,7 @@ auth_userpass(char *user, char *pass, int *errorcode)
         g_free(auth_info);
         return 0;
     }
-    /* From man page:  
+    /* From man page:
        The pam_acct_mgmt function is used to determine if the users account is
        valid. It checks for authentication token and account expiration and
        verifies access restrictions. It is typically called after the user has
diff --git a/sesman/verify_user_pam_userpass.c b/sesman/verify_user_pam_userpass.c
index 4d6aac40..7f31176e 100644
--- a/sesman/verify_user_pam_userpass.c
+++ b/sesman/verify_user_pam_userpass.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/tcp_proxy/main.c b/tests/tcp_proxy/main.c
index 301f79a5..53458a57 100644
--- a/tests/tcp_proxy/main.c
+++ b/tests/tcp_proxy/main.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/vnc/vnc.c b/vnc/vnc.c
index 3d155a21..979033e5 100644
--- a/vnc/vnc.c
+++ b/vnc/vnc.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/vnc/vnc.h b/vnc/vnc.h
index 94d29a30..947b521f 100644
--- a/vnc/vnc.h
+++ b/vnc/vnc.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh
index b778a605..18bbba46 100755
--- a/xorg/X11R7.6/buildx.sh
+++ b/xorg/X11R7.6/buildx.sh
@@ -52,8 +52,9 @@ download_file()
         status=$?
         cd ..
         return $status
-    elif [ "$file" = "pixman-0.15.20.tar.bz2" ]; then
-        wget -cq http://ftp.x.org/pub/individual/lib/$file
+# note pixman updated
+    elif [ "$file" = "pixman-0.30.0.tar.bz2" ]; then
+        wget -cq http://xorg.freedesktop.org/archive/individual/lib/$file
         status=$?
         cd ..
         return $status
diff --git a/xorg/X11R7.6/rdp/gcops.h b/xorg/X11R7.6/rdp/gcops.h
index 8d7b5d48..34870016 100644
--- a/xorg/X11R7.6/rdp/gcops.h
+++ b/xorg/X11R7.6/rdp/gcops.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpCopyArea.c b/xorg/X11R7.6/rdp/rdpCopyArea.c
index 300f857d..cdece2c9 100644
--- a/xorg/X11R7.6/rdp/rdpCopyArea.c
+++ b/xorg/X11R7.6/rdp/rdpCopyArea.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpCopyArea.h b/xorg/X11R7.6/rdp/rdpCopyArea.h
index d5d7c27b..654b6edc 100644
--- a/xorg/X11R7.6/rdp/rdpCopyArea.h
+++ b/xorg/X11R7.6/rdp/rdpCopyArea.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpCopyPlane.c b/xorg/X11R7.6/rdp/rdpCopyPlane.c
index 7ac5d263..47e66e59 100644
--- a/xorg/X11R7.6/rdp/rdpCopyPlane.c
+++ b/xorg/X11R7.6/rdp/rdpCopyPlane.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpCopyPlane.h b/xorg/X11R7.6/rdp/rdpCopyPlane.h
index ae87edc7..85a79e76 100644
--- a/xorg/X11R7.6/rdp/rdpCopyPlane.h
+++ b/xorg/X11R7.6/rdp/rdpCopyPlane.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpFillPolygon.c b/xorg/X11R7.6/rdp/rdpFillPolygon.c
index e703ad03..53227159 100644
--- a/xorg/X11R7.6/rdp/rdpFillPolygon.c
+++ b/xorg/X11R7.6/rdp/rdpFillPolygon.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpFillPolygon.h b/xorg/X11R7.6/rdp/rdpFillPolygon.h
index bb01c379..89da9ae0 100644
--- a/xorg/X11R7.6/rdp/rdpFillPolygon.h
+++ b/xorg/X11R7.6/rdp/rdpFillPolygon.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpFillSpans.c b/xorg/X11R7.6/rdp/rdpFillSpans.c
index 9b719bb4..8025bf45 100644
--- a/xorg/X11R7.6/rdp/rdpFillSpans.c
+++ b/xorg/X11R7.6/rdp/rdpFillSpans.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpFillSpans.h b/xorg/X11R7.6/rdp/rdpFillSpans.h
index 744f0f17..7e014e6b 100644
--- a/xorg/X11R7.6/rdp/rdpFillSpans.h
+++ b/xorg/X11R7.6/rdp/rdpFillSpans.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpImageGlyphBlt.c b/xorg/X11R7.6/rdp/rdpImageGlyphBlt.c
index 7a938e93..e0ec5502 100644
--- a/xorg/X11R7.6/rdp/rdpImageGlyphBlt.c
+++ b/xorg/X11R7.6/rdp/rdpImageGlyphBlt.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpImageGlyphBlt.h b/xorg/X11R7.6/rdp/rdpImageGlyphBlt.h
index 47fca1b3..c5483c7e 100644
--- a/xorg/X11R7.6/rdp/rdpImageGlyphBlt.h
+++ b/xorg/X11R7.6/rdp/rdpImageGlyphBlt.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpImageText16.c b/xorg/X11R7.6/rdp/rdpImageText16.c
index 61a34438..71e9b351 100644
--- a/xorg/X11R7.6/rdp/rdpImageText16.c
+++ b/xorg/X11R7.6/rdp/rdpImageText16.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpImageText16.h b/xorg/X11R7.6/rdp/rdpImageText16.h
index 3fe4f205..0ffb90f2 100644
--- a/xorg/X11R7.6/rdp/rdpImageText16.h
+++ b/xorg/X11R7.6/rdp/rdpImageText16.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpImageText8.c b/xorg/X11R7.6/rdp/rdpImageText8.c
index e714773f..6acdc205 100644
--- a/xorg/X11R7.6/rdp/rdpImageText8.c
+++ b/xorg/X11R7.6/rdp/rdpImageText8.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpImageText8.h b/xorg/X11R7.6/rdp/rdpImageText8.h
index 1a81b271..dc0c4ec5 100644
--- a/xorg/X11R7.6/rdp/rdpImageText8.h
+++ b/xorg/X11R7.6/rdp/rdpImageText8.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyArc.c b/xorg/X11R7.6/rdp/rdpPolyArc.c
index 965fa170..42a8c19e 100644
--- a/xorg/X11R7.6/rdp/rdpPolyArc.c
+++ b/xorg/X11R7.6/rdp/rdpPolyArc.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyArc.h b/xorg/X11R7.6/rdp/rdpPolyArc.h
index 8db9a017..7ebadc35 100644
--- a/xorg/X11R7.6/rdp/rdpPolyArc.h
+++ b/xorg/X11R7.6/rdp/rdpPolyArc.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyFillArc.c b/xorg/X11R7.6/rdp/rdpPolyFillArc.c
index 9bbceb68..aa1171da 100644
--- a/xorg/X11R7.6/rdp/rdpPolyFillArc.c
+++ b/xorg/X11R7.6/rdp/rdpPolyFillArc.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyFillArc.h b/xorg/X11R7.6/rdp/rdpPolyFillArc.h
index 6d5a9bda..9a9846e1 100644
--- a/xorg/X11R7.6/rdp/rdpPolyFillArc.h
+++ b/xorg/X11R7.6/rdp/rdpPolyFillArc.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyFillRect.c b/xorg/X11R7.6/rdp/rdpPolyFillRect.c
index 6bbc34ab..254cdff8 100644
--- a/xorg/X11R7.6/rdp/rdpPolyFillRect.c
+++ b/xorg/X11R7.6/rdp/rdpPolyFillRect.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyFillRect.h b/xorg/X11R7.6/rdp/rdpPolyFillRect.h
index cca9efa2..94ac4b59 100644
--- a/xorg/X11R7.6/rdp/rdpPolyFillRect.h
+++ b/xorg/X11R7.6/rdp/rdpPolyFillRect.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyGlyphBlt.c b/xorg/X11R7.6/rdp/rdpPolyGlyphBlt.c
index 825a29ef..f166b731 100644
--- a/xorg/X11R7.6/rdp/rdpPolyGlyphBlt.c
+++ b/xorg/X11R7.6/rdp/rdpPolyGlyphBlt.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyGlyphBlt.h b/xorg/X11R7.6/rdp/rdpPolyGlyphBlt.h
index 4098c1ec..9c6519d8 100644
--- a/xorg/X11R7.6/rdp/rdpPolyGlyphBlt.h
+++ b/xorg/X11R7.6/rdp/rdpPolyGlyphBlt.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyPoint.c b/xorg/X11R7.6/rdp/rdpPolyPoint.c
index 46eb926b..28db831a 100644
--- a/xorg/X11R7.6/rdp/rdpPolyPoint.c
+++ b/xorg/X11R7.6/rdp/rdpPolyPoint.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyPoint.h b/xorg/X11R7.6/rdp/rdpPolyPoint.h
index 6bb7222b..87bf9459 100644
--- a/xorg/X11R7.6/rdp/rdpPolyPoint.h
+++ b/xorg/X11R7.6/rdp/rdpPolyPoint.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyRectangle.c b/xorg/X11R7.6/rdp/rdpPolyRectangle.c
index 9dd5ad8a..7fdb4e8b 100644
--- a/xorg/X11R7.6/rdp/rdpPolyRectangle.c
+++ b/xorg/X11R7.6/rdp/rdpPolyRectangle.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyRectangle.h b/xorg/X11R7.6/rdp/rdpPolyRectangle.h
index 4bc6600e..d09446d5 100644
--- a/xorg/X11R7.6/rdp/rdpPolyRectangle.h
+++ b/xorg/X11R7.6/rdp/rdpPolyRectangle.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolySegment.c b/xorg/X11R7.6/rdp/rdpPolySegment.c
index 85b316f3..fab6445e 100644
--- a/xorg/X11R7.6/rdp/rdpPolySegment.c
+++ b/xorg/X11R7.6/rdp/rdpPolySegment.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolySegment.h b/xorg/X11R7.6/rdp/rdpPolySegment.h
index 17bf0547..8c5f33ab 100644
--- a/xorg/X11R7.6/rdp/rdpPolySegment.h
+++ b/xorg/X11R7.6/rdp/rdpPolySegment.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyText16.c b/xorg/X11R7.6/rdp/rdpPolyText16.c
index c2c31dbd..034b11e1 100644
--- a/xorg/X11R7.6/rdp/rdpPolyText16.c
+++ b/xorg/X11R7.6/rdp/rdpPolyText16.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyText16.h b/xorg/X11R7.6/rdp/rdpPolyText16.h
index 87e58f13..bcfa8379 100644
--- a/xorg/X11R7.6/rdp/rdpPolyText16.h
+++ b/xorg/X11R7.6/rdp/rdpPolyText16.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyText8.c b/xorg/X11R7.6/rdp/rdpPolyText8.c
index 99b0a045..c06feac3 100644
--- a/xorg/X11R7.6/rdp/rdpPolyText8.c
+++ b/xorg/X11R7.6/rdp/rdpPolyText8.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolyText8.h b/xorg/X11R7.6/rdp/rdpPolyText8.h
index fb68649c..95e80412 100644
--- a/xorg/X11R7.6/rdp/rdpPolyText8.h
+++ b/xorg/X11R7.6/rdp/rdpPolyText8.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolylines.c b/xorg/X11R7.6/rdp/rdpPolylines.c
index 92b51a71..92bb0678 100644
--- a/xorg/X11R7.6/rdp/rdpPolylines.c
+++ b/xorg/X11R7.6/rdp/rdpPolylines.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPolylines.h b/xorg/X11R7.6/rdp/rdpPolylines.h
index fd98439a..2df3d388 100644
--- a/xorg/X11R7.6/rdp/rdpPolylines.h
+++ b/xorg/X11R7.6/rdp/rdpPolylines.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPushPixels.c b/xorg/X11R7.6/rdp/rdpPushPixels.c
index c9458bff..f7b77f23 100644
--- a/xorg/X11R7.6/rdp/rdpPushPixels.c
+++ b/xorg/X11R7.6/rdp/rdpPushPixels.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPushPixels.h b/xorg/X11R7.6/rdp/rdpPushPixels.h
index 249da583..2e0cd1d1 100644
--- a/xorg/X11R7.6/rdp/rdpPushPixels.h
+++ b/xorg/X11R7.6/rdp/rdpPushPixels.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPutImage.c b/xorg/X11R7.6/rdp/rdpPutImage.c
index 4f3764d9..614d0a31 100644
--- a/xorg/X11R7.6/rdp/rdpPutImage.c
+++ b/xorg/X11R7.6/rdp/rdpPutImage.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpPutImage.h b/xorg/X11R7.6/rdp/rdpPutImage.h
index 94119a81..82e27872 100644
--- a/xorg/X11R7.6/rdp/rdpPutImage.h
+++ b/xorg/X11R7.6/rdp/rdpPutImage.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpSetSpans.c b/xorg/X11R7.6/rdp/rdpSetSpans.c
index 101a2d6b..2b650e94 100644
--- a/xorg/X11R7.6/rdp/rdpSetSpans.c
+++ b/xorg/X11R7.6/rdp/rdpSetSpans.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpSetSpans.h b/xorg/X11R7.6/rdp/rdpSetSpans.h
index 3346f00e..acaedd66 100644
--- a/xorg/X11R7.6/rdp/rdpSetSpans.h
+++ b/xorg/X11R7.6/rdp/rdpSetSpans.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpdraw.c b/xorg/X11R7.6/rdp/rdpdraw.c
index e711733b..839854af 100644
--- a/xorg/X11R7.6/rdp/rdpdraw.c
+++ b/xorg/X11R7.6/rdp/rdpdraw.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpdraw.h b/xorg/X11R7.6/rdp/rdpdraw.h
index 38d46ecc..af29daa8 100644
--- a/xorg/X11R7.6/rdp/rdpdraw.h
+++ b/xorg/X11R7.6/rdp/rdpdraw.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c
index b5fc28a5..2254f128 100644
--- a/xorg/X11R7.6/rdp/rdpmain.c
+++ b/xorg/X11R7.6/rdp/rdpmain.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdpmisc.c b/xorg/X11R7.6/rdp/rdpmisc.c
index c221dd15..dc54581a 100644
--- a/xorg/X11R7.6/rdp/rdpmisc.c
+++ b/xorg/X11R7.6/rdp/rdpmisc.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005-2012 Jay Sorg
+Copyright 2005-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdprandr.c b/xorg/X11R7.6/rdp/rdprandr.c
index 45e3ecf4..a767b1d8 100644
--- a/xorg/X11R7.6/rdp/rdprandr.c
+++ b/xorg/X11R7.6/rdp/rdprandr.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2011-2012 Jay Sorg
+Copyright 2011-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/rdp/rdprandr.h b/xorg/X11R7.6/rdp/rdprandr.h
index d4c8417e..3aba7e1a 100644
--- a/xorg/X11R7.6/rdp/rdprandr.h
+++ b/xorg/X11R7.6/rdp/rdprandr.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2011-2012 Jay Sorg
+Copyright 2011-2013 Jay Sorg
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
diff --git a/xorg/X11R7.6/x11_file_list.txt b/xorg/X11R7.6/x11_file_list.txt
index 1223e812..d6f86892 100644
--- a/xorg/X11R7.6/x11_file_list.txt
+++ b/xorg/X11R7.6/x11_file_list.txt
@@ -10,7 +10,7 @@ damageproto-1.2.1.tar.bz2                       :  damageproto-1.2.1
 makedepend-1.0.3.tar.bz2                        :  makedepend-1.0.3                         :
 libxml2-sources-2.7.8.tar.gz                    :  libxml2-2.7.8                            :
 libpng-1.2.46.tar.gz                            :  libpng-1.2.46                            :
-pixman-0.15.20.tar.bz2                          :  pixman-0.15.20                           : --disable-gtk
+pixman-0.30.0.tar.bz2                           :  pixman-0.30.0                            : --disable-gtk
 freetype-2.4.6.tar.bz2                          :  freetype-2.4.6                           :
 fontconfig-2.8.0.tar.gz                         :  fontconfig-2.8.0                         :
 cairo-1.8.8.tar.gz                              :  cairo-1.8.8                              :
diff --git a/xrdpapi/simple.c b/xrdpapi/simple.c
index afe1a22c..7a674b69 100644
--- a/xrdpapi/simple.c
+++ b/xrdpapi/simple.c
@@ -1,8 +1,8 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2012
- * Copyright (C) Laxmikant Rashinkar 2012
+ * Copyright (C) Jay Sorg 2012-2013
+ * Copyright (C) Laxmikant Rashinkar 2012-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xrdpapi/vrplayer.c b/xrdpapi/vrplayer.c
index 442ef35e..1faf127a 100644
--- a/xrdpapi/vrplayer.c
+++ b/xrdpapi/vrplayer.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Laxmikant Rashinkar 2012 LK.Rashinkar@gmail.com
+ * Copyright (C) Laxmikant Rashinkar 2012-2013 LK.Rashinkar@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xrdpapi/xrdpapi.c b/xrdpapi/xrdpapi.c
index e3b63035..b544b98b 100644
--- a/xrdpapi/xrdpapi.c
+++ b/xrdpapi/xrdpapi.c
@@ -1,8 +1,8 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2012
- * Copyright (C) Laxmikant Rashinkar 2012
+ * Copyright (C) Jay Sorg 2012-2013
+ * Copyright (C) Laxmikant Rashinkar 2012-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xrdpapi/xrdpapi.h b/xrdpapi/xrdpapi.h
index 81e5acd5..ecadceea 100644
--- a/xrdpapi/xrdpapi.h
+++ b/xrdpapi/xrdpapi.h
@@ -1,9 +1,9 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2012
- * Copyright (C) Thomas Goddard 2012
- * Copyright (C) Laxmikant Rashinkar 2012
+ * Copyright (C) Jay Sorg 2012-2013
+ * Copyright (C) Thomas Goddard 2012-2013
+ * Copyright (C) Laxmikant Rashinkar 2012-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xrdpvr/xrdpvr.c b/xrdpvr/xrdpvr.c
index 9c49979a..6f39e975 100644
--- a/xrdpvr/xrdpvr.c
+++ b/xrdpvr/xrdpvr.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Laxmikant Rashinkar 2012 LK.Rashinkar@gmail.com
+ * Copyright (C) Laxmikant Rashinkar 2012-2013 LK.Rashinkar@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xrdpvr/xrdpvr.h b/xrdpvr/xrdpvr.h
index 49ec6c77..f278a703 100644
--- a/xrdpvr/xrdpvr.h
+++ b/xrdpvr/xrdpvr.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Laxmikant Rashinkar 2012 LK.Rashinkar@gmail.com
+ * Copyright (C) Laxmikant Rashinkar 2012-2013 LK.Rashinkar@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xrdpvr/xrdpvr_internal.h b/xrdpvr/xrdpvr_internal.h
index 29160d46..90753a06 100644
--- a/xrdpvr/xrdpvr_internal.h
+++ b/xrdpvr/xrdpvr_internal.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Laxmikant Rashinkar 2012 LK.Rashinkar@gmail.com
+ * Copyright (C) Laxmikant Rashinkar 2012-2013 LK.Rashinkar@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.