diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index da3498e32525..e265b4628bb0 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	uuid
 PORTVERSION=	1.6.2
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	misc devel
 MASTER_SITES=	OSSP/lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	ISO-C API and CLI for generating Universally Unique Identifiers
 WWW=		http://www.ossp.org/pkg/lib/uuid/
 
 LICENSE=	UNKNOWN
 LICENSE_NAME=	unknown
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="perl"
 LICENSE_FILE=	${WRKSRC}/../README
 .else
 LICENSE_FILE=	${WRKSRC}/README
 .endif
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USES+=		libtool pathfix
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-cxx \
 		--includedir=${PREFIX}/include/ossp
 
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="perl"
 PKGNAMEPREFIX=	p5-OSSP-
 .else
 TEST_TARGET=	check
 .endif
 
 pre-patch:
 ### Fixes lib conflicts with misc/libuuid ###
 	@${REINPLACE_CMD} 's/libuuid.la/libossp-uuid.la/ ; s/libuuid++.la/libossp-uuid++.la/' \
 		${WRKDIR}/${DISTNAME}/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${LICENSE_FILE} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/misc/ossp-uuid/files/patch-uuid.c b/misc/ossp-uuid/files/patch-uuid.c
new file mode 100644
index 000000000000..abbccbbdc909
--- /dev/null
+++ b/misc/ossp-uuid/files/patch-uuid.c
@@ -0,0 +1,87 @@
+--- uuid.c.orig	2008-03-07 10:49:59 UTC
++++ uuid.c
+@@ -148,6 +148,7 @@ uuid_rc_t uuid_create(uuid_t **uuid)
+ 
+     return UUID_RC_OK;
+ }
++uuid_rc_t ossp_uuid_create(uuid_t **uuid) __attribute__((alias("uuid_create")));
+ 
+ /* destroy UUID object */
+ uuid_rc_t uuid_destroy(uuid_t *uuid)
+@@ -166,6 +167,7 @@ uuid_rc_t uuid_destroy(uuid_t *uuid)
+ 
+     return UUID_RC_OK;
+ }
++uuid_rc_t ossp_uuid_destroy(uuid_t *uuid) __attribute__((alias("uuid_destroy")));
+ 
+ /* clone UUID object */
+ uuid_rc_t uuid_clone(const uuid_t *uuid, uuid_t **clone)
+@@ -205,6 +207,7 @@ uuid_rc_t uuid_clone(const uuid_t *uuid, uuid_t **clon
+ 
+     return UUID_RC_OK;
+ }
++uuid_rc_t ossp_uuid_clone(const uuid_t *uuid, uuid_t **clone) __attribute__((alias("uuid_clone")));
+ 
+ /* check whether UUID object represents "Nil UUID" */
+ uuid_rc_t uuid_isnil(const uuid_t *uuid, int *result)
+@@ -227,6 +230,7 @@ uuid_rc_t uuid_isnil(const uuid_t *uuid, int *result)
+ 
+     return UUID_RC_OK;
+ }
++uuid_rc_t ossp_uuid_isnil(const uuid_t *uuid, int *result) __attribute__((alias("uuid_isnil")));
+ 
+ /* compare UUID objects */
+ uuid_rc_t uuid_compare(const uuid_t *uuid1, const uuid_t *uuid2, int *result)
+@@ -280,6 +284,7 @@ uuid_rc_t uuid_compare(const uuid_t *uuid1, const uuid
+     result_exit:
+     return UUID_RC_OK;
+ }
++uuid_rc_t ossp_uuid_compare(const uuid_t *uuid1, const uuid_t *uuid2, int *result) __attribute__((alias("uuid_compare")));
+ 
+ /* INTERNAL: unpack UUID binary presentation into UUID object
+    (allows in-place operation for internal efficiency!) */
+@@ -835,6 +840,7 @@ uuid_rc_t uuid_import(uuid_t *uuid, uuid_fmt_t fmt, co
+ 
+     return rc;
+ }
++uuid_rc_t ossp_uuid_import(uuid_t *uuid, uuid_fmt_t fmt, const void *data_ptr, size_t data_len) __attribute__((alias("uuid_import")));
+ 
+ /* UUID exporting */
+ uuid_rc_t uuid_export(const uuid_t *uuid, uuid_fmt_t fmt, void *data_ptr, size_t *data_len)
+@@ -856,6 +862,7 @@ uuid_rc_t uuid_export(const uuid_t *uuid, uuid_fmt_t f
+ 
+     return rc;
+ }
++uuid_rc_t ossp_uuid_export(const uuid_t *uuid, uuid_fmt_t fmt, void *data_ptr, size_t *data_len) __attribute__((alias("uuid_export")));
+ 
+ /* INTERNAL: brand UUID with version and variant */
+ static void uuid_brand(uuid_t *uuid, unsigned int version)
+@@ -1044,6 +1051,7 @@ uuid_rc_t uuid_load(uuid_t *uuid, const char *name)
+ 
+     return UUID_RC_OK;
+ }
++uuid_rc_t ossp_uuid_load(uuid_t *uuid, const char *name) __attribute__((alias("uuid_load")));
+ 
+ /* INTERNAL: generate UUID version 3: name based with MD5 */
+ static uuid_rc_t uuid_make_v3(uuid_t *uuid, unsigned int mode, va_list ap)
+@@ -1191,6 +1199,7 @@ uuid_rc_t uuid_make(uuid_t *uuid, unsigned int mode, .
+ 
+     return rc;
+ }
++uuid_rc_t ossp_uuid_make(uuid_t *uuid, unsigned int mode, ...) __attribute__((alias("uuid_make")));
+ 
+ /* translate UUID API error code into corresponding error string */
+ char *uuid_error(uuid_rc_t rc)
+@@ -1208,10 +1217,12 @@ char *uuid_error(uuid_rc_t rc)
+     }
+     return str;
+ }
++char *ossp_uuid_error(uuid_rc_t rc) __attribute__((alias("uuid_error")));
+ 
+ /* OSSP uuid version (link-time information) */
+ unsigned long uuid_version(void)
+ {
+     return (unsigned long)(_UUID_VERSION);
+ }
++unsigned long ossp_uuid_version(void) __attribute__((alias("uuid_version")));
+ 
diff --git a/misc/ossp-uuid/files/patch-uuid.h.in b/misc/ossp-uuid/files/patch-uuid.h.in
new file mode 100644
index 000000000000..f74774953fcc
--- /dev/null
+++ b/misc/ossp-uuid/files/patch-uuid.h.in
@@ -0,0 +1,38 @@
+--- uuid.h.in.orig	2008-03-07 10:49:59 UTC
++++ uuid.h.in
+@@ -95,24 +95,35 @@ extern uuid_rc_t     uuid_create   (      uuid_t **_uu
+ 
+ /* UUID object handling */
+ extern uuid_rc_t     uuid_create   (      uuid_t **_uuid);
++extern uuid_rc_t     ossp_uuid_create   (      uuid_t **_uuid);
+ extern uuid_rc_t     uuid_destroy  (      uuid_t  *_uuid);
++extern uuid_rc_t     ossp_uuid_destroy  (      uuid_t  *_uuid);
+ extern uuid_rc_t     uuid_clone    (const uuid_t  *_uuid, uuid_t **_clone);
++extern uuid_rc_t     ossp_uuid_clone    (const uuid_t  *_uuid, uuid_t **_clone);
+ 
+ /* UUID generation */
+ extern uuid_rc_t     uuid_load     (      uuid_t  *_uuid, const char *_name);
++extern uuid_rc_t     ossp_uuid_load     (      uuid_t  *_uuid, const char *_name);
+ extern uuid_rc_t     uuid_make     (      uuid_t  *_uuid, unsigned int _mode, ...);
++extern uuid_rc_t     ossp_uuid_make     (      uuid_t  *_uuid, unsigned int _mode, ...);
+ 
+ /* UUID comparison */
+ extern uuid_rc_t     uuid_isnil    (const uuid_t  *_uuid,                       int *_result);
++extern uuid_rc_t     ossp_uuid_isnil    (const uuid_t  *_uuid,                       int *_result);
+ extern uuid_rc_t     uuid_compare  (const uuid_t  *_uuid, const uuid_t *_uuid2, int *_result);
++extern uuid_rc_t     ossp_uuid_compare  (const uuid_t  *_uuid, const uuid_t *_uuid2, int *_result);
+ 
+ /* UUID import/export */
+ extern uuid_rc_t     uuid_import   (      uuid_t  *_uuid, uuid_fmt_t _fmt, const void  *_data_ptr, size_t  _data_len);
++extern uuid_rc_t     ossp_uuid_import   (      uuid_t  *_uuid, uuid_fmt_t _fmt, const void  *_data_ptr, size_t  _data_len);
+ extern uuid_rc_t     uuid_export   (const uuid_t  *_uuid, uuid_fmt_t _fmt,       void  *_data_ptr, size_t *_data_len);
++extern uuid_rc_t     ossp_uuid_export   (const uuid_t  *_uuid, uuid_fmt_t _fmt,       void  *_data_ptr, size_t *_data_len);
+ 
+ /* library utilities */
+ extern char         *uuid_error    (uuid_rc_t _rc);
++extern char         *ossp_uuid_error    (uuid_rc_t _rc);
+ extern unsigned long uuid_version  (void);
++extern unsigned long ossp_uuid_version  (void);
+ 
+ DECLARATION_END
+