diff --git net/xrdp/Makefile net/xrdp/Makefile
index 60d441b..68b0d6a 100644
--- net/xrdp/Makefile
+++ net/xrdp/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	xrdp
-PORTVERSION=	0.6.1
+PORTVERSION=	0.6.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	net
 DIST_SUBDIR=	${PORTNAME}
@@ -16,9 +15,8 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf:build libtool pkgconfig
+USES=		autoreconf:build libtool pkgconfig ssl
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
-USE_OPENSSL=	yes
 USE_RC_SUBR=	xrdp
 USE_XORG=	x11 xfixes
 
diff --git net/xrdp/distinfo net/xrdp/distinfo
index e161b94..b8c1e01 100644
--- net/xrdp/distinfo
+++ net/xrdp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 7b5a91fc5aa5a36bebff2b5ed19854486bf8836b7d01ad7bb00caa4e6b107c5b
-SIZE (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 1559359
+TIMESTAMP = 1475561595
+SHA256 (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1e12e41537b3cac15f5c216663fc18a15df5a16e9eb2bc1768bea16190815438
+SIZE (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1559505
diff --git net/xrdp/files/patch-common__os_calls.c net/xrdp/files/patch-common__os_calls.c
deleted file mode 100644
index f74ccad..0000000
--- net/xrdp/files/patch-common__os_calls.c
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git common/os_calls.c common/os_calls.c
-index 692dc01..7075ee3 100644
---- common/os_calls.c
-+++ common/os_calls.c
-@@ -2115,8 +2115,12 @@ g_clearenv(void)
- {
- #if defined(_WIN32)
- #else
-+#if defined(BSD)
-+  environ[0] = 0;
-+#else
-   environ = 0;
- #endif
-+#endif
- }
- 
- /*****************************************************************************/
diff --git net/xrdp/files/patch-sesman__verify_user_pam.c net/xrdp/files/patch-sesman__verify_user_pam.c
deleted file mode 100644
index 5ce5ed3..0000000
--- net/xrdp/files/patch-sesman__verify_user_pam.c
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git sesman/verify_user_pam.c sesman/verify_user_pam.c
-index e3d8596..281e297 100644
---- sesman/verify_user_pam.c
-+++ sesman/verify_user_pam.c
-@@ -117,6 +117,14 @@ auth_userpass(char* user, char* pass)
-     g_free(auth_info);
-     return 0;
-   }
-+
-+  error = pam_set_item(auth_info->ph, PAM_TTY, service_name);
-+  if (error != PAM_SUCCESS)
-+  {
-+    g_printf("pam_set_item failed: %s\r\n",
-+                         pam_strerror(auth_info->ph, error));
-+  }
-+
-   error = pam_authenticate(auth_info->ph, 0);
-   if (error != PAM_SUCCESS)
-   {