diff --git a/src/ChangeLog b/src/ChangeLog
index b1271fa7b7c..2aba406af37 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-29  Jeramey Crawford  <jeramey@jeramey.com>
+
+	* m/amdx86-64.h: Add defines for OpenBSD x86-64.
+
 2006-10-29  Juanma Barranquero  <lekktu@gmail.com>
 
 	* window.c (Fdisplay_buffer): Fix typo in docstring.
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 3a1ace91b41..419fa131692 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -118,7 +118,14 @@ Boston, MA 02110-1301, USA.  */
 #undef LIB_STANDARD
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
 
-#else /* !__FreeBSD__ */
+#elif defined(__OpenBSD__)
+
+#undef START_FILES
+#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o
+#undef LIB_STANDARD
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
+
+#else /* !__OpenBSD__ && !__FreeBSD__ */
 
 #undef START_FILES
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o