diff --git a/ipmitool/Makefile.am b/ipmitool/Makefile.am
index c861e9a..1502e5f 100644
--- a/ipmitool/Makefile.am
+++ b/ipmitool/Makefile.am
@@ -32,7 +32,7 @@
 # in the design, construction, operation or maintenance of any nuclear
 # facility.
 
-DOCDIR = $(DESTDIR)/$(datadir)/doc/$(distdir)
+DOCDIR = $(DESTDIR)/$(datadir)/doc/$(PACKAGE)
 DOCLIST = README COPYING AUTHORS ChangeLog
 
 EXTRA_DIST = $(DOCLIST) \
diff --git a/ipmitool/control/ipmitool.spec.in b/ipmitool/control/ipmitool.spec.in
index 587d7aa..51a09fa 100644
--- a/ipmitool/control/ipmitool.spec.in
+++ b/ipmitool/control/ipmitool.spec.in
@@ -52,11 +52,10 @@ rm -rf $RPM_BUILD_DIR/ipmitool-@VERSION@
 
 %files
 %defattr(-,root,root)
-%doc %{_mandir}/man1/*
 %{_bindir}/*
-%{_datadir}/doc/ipmitool-@VERSION@/*
-%dir %{_datadir}/ipmitool
 %{_datadir}/ipmitool/*
+%doc %{_mandir}/man1/*
+%doc %{_datadir}/doc/ipmitool/*
 
 %changelog
 * Wed Aug 18 2004 <duncan@iceblink.org>  1.6.0-1
diff --git a/ipmitool/debian/control b/ipmitool/debian/control
index 61610de..d4f5078 100644
--- a/ipmitool/debian/control
+++ b/ipmitool/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>> 3.0.0)
 Standards-Version: 3.5.8
 
 Package: ipmitool
-Architecture: i386
+Architecture: i386 amd64
 Provides: ipmitool
 Description: Utility for IPMI control with kernel driver or LAN interface
 
diff --git a/ipmitool/debian/dirs b/ipmitool/debian/dirs
index 3509eaf..7f7814f 100644
--- a/ipmitool/debian/dirs
+++ b/ipmitool/debian/dirs
@@ -1,2 +1,3 @@
 usr/bin
-usr/include/ipmitool
+usr/share/ipmitool
+usr/share/doc/ipmitool
diff --git a/ipmitool/debian/docs b/ipmitool/debian/docs
index c8fe673..dfa93e8 100644
--- a/ipmitool/debian/docs
+++ b/ipmitool/debian/docs
@@ -1,3 +1,4 @@
+README
 COPYING
 AUTHORS
 ChangeLog