diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf5369d3a31..c609a3764a8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-20  Loren James Rittle  <ljrittle@acm.org>
+
+	* config/i386/freebsd.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Handle
+	redefine warning.
+
 2003-08-20  Roger Sayle  <roger@eyesopen.com>
 
 	PR middle-end/11984
diff --git a/gcc/config/i386/freebsd.h b/gcc/config/i386/freebsd.h
index 0e02de78c8a..c3acda2e470 100644
--- a/gcc/config/i386/freebsd.h
+++ b/gcc/config/i386/freebsd.h
@@ -116,6 +116,7 @@ Boston, MA 02111-1307, USA.  */
    This is used to align code labels according to Intel recommendations.  */
 
 #ifdef HAVE_GAS_MAX_SKIP_P2ALIGN
+#undef  ASM_OUTPUT_MAX_SKIP_ALIGN
 #define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE, LOG, MAX_SKIP)					\
   if ((LOG) != 0) {														\
     if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG));	\