diff --git a/ChangeLog b/ChangeLog
index b5c659c65..a2382cfd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@ Bugfix
      big-endian platform when size was not an integer number of limbs
    * Fix dependencies issues in X.509 test suite.
    * Some parts of ssl_tls.c were compiled even when the module was disabled.
+   * Fix detection of DragonflyBSD in net.c (found by Markus Pfeiffer)
 
 = PolarSSL 1.3.6 released on 2014-04-11
 
diff --git a/library/net.c b/library/net.c
index 0bc2f68ae..be4be5e09 100644
--- a/library/net.c
+++ b/library/net.c
@@ -78,7 +78,7 @@ static int wsa_init_done = 0;
 #include <errno.h>
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ||  \
-    defined(__DragonflyBSD__)
+    defined(__DragonFly__)
 #include <sys/endian.h>
 #elif defined(__APPLE__) || defined(HAVE_MACHINE_ENDIAN_H) ||   \
       defined(EFIX64) || defined(EFI32)
diff --git a/tests/scripts/generate_code.pl b/tests/scripts/generate_code.pl
index 6cba14f51..5440ced32 100755
--- a/tests/scripts/generate_code.pl
+++ b/tests/scripts/generate_code.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 
 use strict;