diff --git a/apmd-3.2-build.patch b/apmd-3.2-build.patch
new file mode 100644
index 0000000..3a24a78
--- /dev/null
+++ b/apmd-3.2-build.patch
@@ -0,0 +1,22 @@
+--- apmd-3.2.2.orig/Makefile.FHS	2004-01-04 03:13:18.000000000 -0500
++++ apmd-3.2.2.orig/Makefile	2005-03-16 16:25:08.000000000 -0500
+@@ -32,8 +32,8 @@
+ EXES=apm apmd xapm apmsleep
+ HEADERS=apm.h
+ 
+-PREFIX=/usr
+-MANDIR=$(PREFIX)/man
++PREFIX=$(prefix)
++MANDIR=$(PREFIX)/share/man
+ BINDIR=$(PREFIX)/bin
+ SBINDIR=$(PREFIX)/sbin
+ LIBDIR=$(PREFIX)/lib
+@@ -42,7 +42,7 @@
+ DESTDIR=
+ 
+ CC=gcc
+-CFLAGS=-O -g
++CFLAGS=$(RPM_OPT_FLAGS)
+ XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \
+ 		-I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \
+ 		-DVERSION=\"$(VERSION)\" \
diff --git a/apmd-3.2-error.patch b/apmd-3.2-error.patch
new file mode 100644
index 0000000..25fb7ca
--- /dev/null
+++ b/apmd-3.2-error.patch
@@ -0,0 +1,53 @@
+--- apmd-3.2.2.orig/apm.c.foo	2005-03-16 17:23:14.000000000 -0500
++++ apmd-3.2.2.orig/apm.c	2005-03-16 17:23:44.000000000 -0500
+@@ -38,7 +38,7 @@
+ #define IGNORE 2
+ #define NOIGNORE 3
+ 
+-void change_state(int mode)
++int change_state(int mode)
+ {
+     int fd;
+     time_t then, now;
+@@ -48,7 +48,7 @@
+     if (fd < 0)
+     {
+ 	fprintf(stderr, "Cannot open APM device: %s\n", strerror(errno));
+-	exit(1);
++	return (1);
+     }
+     time(&then);
+     switch (mode)
+@@ -78,6 +78,7 @@
+ 	time(&now);
+ 
+     apm_close(fd);
++    return error;
+ }
+ 
+ void usage(void)
+@@ -135,12 +136,10 @@
+ 	    break;
+ #ifdef APM_IOC_IGNORE		/* detect kernel support of IGNORE/NOIGNORE functions */
+ 	case 'i':
+-	    change_state(IGNORE);
+-	    exit(0);
++	    exit(change_state(IGNORE));
+ 	    break;
+ 	case 'n':
+-	    change_state(NOIGNORE);
+-	    exit(0);
++	    exit change_state(NOIGNORE));
+ 	    break;
+ #endif
+ 	case 'v':
+@@ -182,8 +181,7 @@
+ 	usage();
+     if (suspend || standby)
+     {
+-	change_state((suspend ? SUSPEND : STANDBY));
+-	exit(0);
++	exit(change_state((suspend ? SUSPEND : STANDBY)));
+     }
+ 
+     if (apm_read(&i))
diff --git a/apmd-3.2-umask.patch b/apmd-3.2-umask.patch
new file mode 100644
index 0000000..75ab108
--- /dev/null
+++ b/apmd-3.2-umask.patch
@@ -0,0 +1,10 @@
+--- apmd-3.2.2.orig/apmd.c.sec	2004-04-30 00:29:47.000000000 -0400
++++ apmd-3.2.2.orig/apmd.c	2005-03-16 16:26:47.000000000 -0500
+@@ -1190,7 +1190,6 @@
+ 	close(1);
+ 	if (verbosity < LOG_DEBUG)
+ 		close(2);
+-	umask(0);
+ 
+ 	apmd_fd = open(APM_DEVICE, O_RDWR);
+ 	if (apmd_fd < 0) {
diff --git a/apmd-3.2-x.patch b/apmd-3.2-x.patch
new file mode 100644
index 0000000..4b0ea35
--- /dev/null
+++ b/apmd-3.2-x.patch
@@ -0,0 +1,38 @@
+--- apmd-3.2.2.orig/Makefile.x	2005-03-16 16:32:42.000000000 -0500
++++ apmd-3.2.2.orig/Makefile	2005-03-16 16:33:26.000000000 -0500
+@@ -29,7 +29,7 @@
+ .SUFFIXES:
+ 
+ OBJS=apmlib.o
+-EXES=apm apmd xapm apmsleep
++EXES=apm apmd apmsleep
+ HEADERS=apm.h
+ 
+ PREFIX=$(prefix)
+@@ -74,18 +74,12 @@
+ %: %.o $(LIBAPM)
+ 	$(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM)
+ 
+-xapm.o: xapm.c
+-	$(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) -DNARROWPROTO $<
+-
+ apmd: apmd.o
+ 
+ apmsleep: apmsleep.o
+ 
+ apmexists: apmexists.o
+ 
+-xapm: xapm.o $(LIBAPM)
+-	$(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) $(XLDFLAGS) $(XLIBS)
+-
+ $(LIBAPM): apmlib.lo
+ 	$(LT_LINK) -o $@ $< $(LIBAPM_FLAGS) $(LDFLAGS)
+ 
+@@ -105,7 +99,6 @@
+ 	$(LT_INSTALL) -m 644 $(LIBAPM)   $(DESTDIR)$(LIBDIR)
+ 	$(LT_INSTALL)        apm         $(DESTDIR)$(BINDIR)
+ 	$(LT_INSTALL)        apmd        $(DESTDIR)$(SBINDIR)
+-	$(LT_INSTALL)        xapm        $(DESTDIR)$(BINDIR)
+ 	$(LT_INSTALL)        apmsleep    $(DESTDIR)$(BINDIR)
+ 	install              on_ac_power $(DESTDIR)$(BINDIR)
+ 	install       -m 644 apm.h       $(DESTDIR)$(INCDIR)