diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 8e4ca55e53a4..0e6feadfefa8 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2009/01/18 13:53:33 jmcneill Exp $
+# $NetBSD: Makefile,v 1.32 2009/01/23 11:13:38 sketch Exp $
 #
 
 DISTNAME=		hal-0.5.11
@@ -60,6 +60,8 @@ CONFIGURE_ARGS+=	--with-backend=dummy
 PLIST_SRC=		PLIST
 .endif
 
+CFLAGS.SunOS+=		-Du_int32_t=uint32_t
+
 .if ${OPSYS} == "Darwin"
 BUILDLINK_TRANSFORM+=	rm:-Wl,--as-needed
 .endif
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 16e9c5ceafe0..37821d30874e 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/01/03 01:28:34 obache Exp $
+$NetBSD: distinfo,v 1.12 2009/01/23 11:13:38 sketch Exp $
 
 SHA1 (hal-0.5.11.tar.bz2) = 1ddb7895d2ddc2464b553ad11f7ba38860478ae9
 RMD160 (hal-0.5.11.tar.bz2) = 741cfe82f0bc2d67106b24cfe526a754ab36e45f
@@ -19,6 +19,7 @@ SHA1 (patch-am) = 6a4940006e583300d9a983511bdcb05268f74b1a
 SHA1 (patch-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2
 SHA1 (patch-ao) = 9099fa4783921a0389b874b8f6d3f7b890810b34
 SHA1 (patch-ap) = 4846d30f51239cca5ea895c700d7a7b15efd948e
+SHA1 (patch-aq) = 7d0b224b4b1e6052983a6512217eee4f530e0720
 SHA1 (patch-na) = f4344e2aa02e67c968f9723495c533c3a9a199fd
 SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
 SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
diff --git a/sysutils/hal/patches/patch-aq b/sysutils/hal/patches/patch-aq
new file mode 100644
index 000000000000..1cc62be53ee2
--- /dev/null
+++ b/sysutils/hal/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.1 2009/01/23 11:13:38 sketch Exp $
+
+--- libhal/libhal.c.orig	Fri Jan 23 10:42:56 2009
++++ libhal/libhal.c	Fri Jan 23 11:08:11 2009
+@@ -4103,8 +4103,10 @@
+ static void
+ libhal_changeset_append (LibHalChangeSet *changeset, LibHalChangeSetElement *elem)
+ {
++#if !defined(__SUNPRO_C)
+ 	LIBHAL_CHECK_PARAM_VALID(changeset, "*changeset", (void) NULL );
+ 	LIBHAL_CHECK_PARAM_VALID(elem, "*elem", (void) NULL);
++#endif
+ 
+ 	if (changeset->head == NULL) {
+ 		changeset->head = elem;