diff --git a/liba52/bitstream.h b/liba52/bitstream.h
index 66ed3fc1c7..e59e4e9dcd 100644
--- a/liba52/bitstream.h
+++ b/liba52/bitstream.h
@@ -21,10 +21,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef __sparc__
+#if defined(__sparc__) || defined(hpux)
 /*
  * the alt bitstream reader performs unaligned memory accesses; that doesn't work
- * on sparc.  For now, disable ALT_BITSTREAM_READER.
+ * on sparc/hpux.  For now, disable ALT_BITSTREAM_READER.
  */
 #undef	ALT_BITSTREAM_READER
 #else
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 63c80fc999..12d35b20df 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -743,8 +743,8 @@ read_next:
 
 	    if(d->angle_seek){
 		int i,skip=0;
-#if defined(__GNUC__) && defined(__sparc__)
-		// workaround for a bug in the sparc version of gcc 2.95.X ... 3.2,
+#if defined(__GNUC__) && ( defined(__sparc__) || defined(hpux) )
+		// workaround for a bug in the sparc/hpux version of gcc 2.95.X ... 3.2,
 		// it generates incorrect code for unaligned access to a packed
 		// structure member, resulting in an mplayer crash with a SIGBUS
 		// signal.