diff --git a/CHANGELOG b/CHANGELOG
index aadb2309..3c587366 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,10 @@ HISTORY
 
   ++ New features:
 
+  2008-06-17 Simon Goldschmidt
+  * slipif.c: patch #6480: Added a configuration option for slipif for symmetry
+    to loopif
+
   2008-06-17 Simon Goldschmidt (patch by Luca Ceresoli)
   * netif.c, loopif.c, ip.c, netif.h, loopif.h, opt.h: Checked in slightly
     modified version of patch # 6370: Moved loopif code to netif.c so that
diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index f362b0b1..5b8eca9e 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -877,6 +877,18 @@
 #define LWIP_HAVE_LOOPIF                0
 #endif
 
+/*
+   ------------------------------------
+   ---------- SLIPIF options ----------
+   ------------------------------------
+*/
+/**
+ * LWIP_HAVE_SLIPIF==1: Support slip interface and slipif.c
+ */
+#ifndef LWIP_HAVE_SLIPIF
+#define LWIP_HAVE_SLIPIF                0
+#endif
+
 /*
    ------------------------------------
    ---------- Thread options ----------
diff --git a/src/netif/slipif.c b/src/netif/slipif.c
index b3788593..6cb2db44 100644
--- a/src/netif/slipif.c
+++ b/src/netif/slipif.c
@@ -44,6 +44,9 @@
 
 #include "netif/slipif.h"
 #include "lwip/opt.h"
+
+#if LWIP_HAVE_SLIPIF
+
 #include "lwip/def.h"
 #include "lwip/pbuf.h"
 #include "lwip/sys.h"
@@ -273,3 +276,4 @@ slipif_init(struct netif *netif)
   sys_thread_new(SLIPIF_THREAD_NAME, slipif_loop, netif, SLIPIF_THREAD_STACKSIZE, SLIPIF_THREAD_PRIO);
   return ERR_OK;
 }
+#endif /* LWIP_HAVE_SLIPIF */