diff --git a/miniupnpd/Changelog.txt b/miniupnpd/Changelog.txt
index 0342d6d..5d77a7f 100644
--- a/miniupnpd/Changelog.txt
+++ b/miniupnpd/Changelog.txt
@@ -1,8 +1,12 @@
-$Id: Changelog.txt,v 1.242 2011/11/18 11:21:20 nanard Exp $
+$Id: Changelog.txt,v 1.247 2012/01/20 21:45:56 nanard Exp $
+
+2012/01/20:
+  Always #include <netinet/in.h> before #include <arpa/inet.h> (for OpenBSD)
 
 2012/01/02:
   Fixing netfilter/iptables_*.sh scripts for new ifconfig output format.
   getifaddr.c: added additional checks on structure returned by getifaddrs()
+  Fixing Mac OS X makefile for installation
 
 2011/11/18:
   avoid infinite loop in SendResp_upnphttp() in case of error
diff --git a/miniupnpd/bsd/getifstats.c b/miniupnpd/bsd/getifstats.c
index f10b60c..780523e 100644
--- a/miniupnpd/bsd/getifstats.c
+++ b/miniupnpd/bsd/getifstats.c
@@ -9,8 +9,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #if defined(__FreeBSD__) || defined(__DragonFly__)
 #include <net/if_var.h>
 #endif
diff --git a/miniupnpd/getifaddr.c b/miniupnpd/getifaddr.c
index a3a24ae..e988001 100644
--- a/miniupnpd/getifaddr.c
+++ b/miniupnpd/getifaddr.c
@@ -1,4 +1,4 @@
-/* $Id: getifaddr.c,v 1.12 2012/01/02 10:08:42 nanard Exp $ */
+/* $Id: getifaddr.c,v 1.13 2012/01/20 21:45:57 nanard Exp $ */
 /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * (c) 2006-2011 Thomas Bernard 
@@ -13,8 +13,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #if defined(sun)
 #include <sys/sockio.h>
 #endif
diff --git a/miniupnpd/upnphttp.c b/miniupnpd/upnphttp.c
index 3a20af1..96d4455 100644
--- a/miniupnpd/upnphttp.c
+++ b/miniupnpd/upnphttp.c
@@ -1,4 +1,4 @@
-/* $Id: upnphttp.c,v 1.64 2011/11/18 11:21:17 nanard Exp $ */
+/* $Id: upnphttp.c,v 1.65 2012/01/20 21:45:57 nanard Exp $ */
 /* Project :  miniupnp
  * Website :  http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * Author :   Thomas Bernard
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <syslog.h>
 #include <ctype.h>
diff --git a/miniupnpd/upnppermissions.c b/miniupnpd/upnppermissions.c
index b15ae23..35b43a3 100644
--- a/miniupnpd/upnppermissions.c
+++ b/miniupnpd/upnppermissions.c
@@ -1,4 +1,4 @@
-/* $Id: upnppermissions.c,v 1.14 2009/12/22 17:21:43 nanard Exp $ */
+/* $Id: upnppermissions.c,v 1.15 2012/01/20 21:45:58 nanard Exp $ */
 /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * (c) 2006 Thomas Bernard
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <syslog.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 #include "config.h"
diff --git a/miniupnpd/upnpsoap.c b/miniupnpd/upnpsoap.c
index 7d6c387..cb634a4 100644
--- a/miniupnpd/upnpsoap.c
+++ b/miniupnpd/upnpsoap.c
@@ -1,4 +1,4 @@
-/* $Id: upnpsoap.c,v 1.88 2011/11/18 11:21:18 nanard Exp $ */
+/* $Id: upnpsoap.c,v 1.89 2012/01/20 21:45:58 nanard Exp $ */
 /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * (c) 2006-2011 Thomas Bernard 
@@ -12,8 +12,8 @@
 #include <unistd.h>
 #include <syslog.h>
 #include <sys/types.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netdb.h>
 
 #include "config.h"