diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h
index 5ae915c31..ca289258c 100644
--- a/platform/cooja/contiki-conf.h
+++ b/platform/cooja/contiki-conf.h
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-conf.h,v 1.16 2010/03/31 09:39:46 fros4943 Exp $
+ * $Id: contiki-conf.h,v 1.17 2010/03/31 10:22:33 fros4943 Exp $
  *
  */
 
@@ -64,6 +64,7 @@
 #define NETSTACK_CONF_RDC nullrdc_driver
 #define NETSTACK_CONF_RADIO cooja_radio_driver
 #define UIP_CONF_IPV6 1
+#define UIP_CONF_IP_FORWARD           0
 
 #else /* WITH_UIP6 */
 
@@ -74,6 +75,7 @@
 #define NETSTACK_CONF_MAC nullmac_driver
 #define NETSTACK_CONF_RDC nullrdc_driver
 #define NETSTACK_CONF_RADIO cooja_radio_driver
+#define UIP_CONF_IP_FORWARD           1
 
 #else /* WITH_UIP */
 
@@ -124,7 +126,6 @@ typedef unsigned long rtimer_clock_t;
 #define UIP_CONF_MAX_CONNECTIONS      40
 #define UIP_CONF_BYTE_ORDER           UIP_LITTLE_ENDIAN
 #define UIP_CONF_TCP_SPLIT            0
-#define UIP_CONF_IP_FORWARD           1
 #define UIP_CONF_LOGGING              0
 #define UIP_CONF_UDP_CHECKSUMS        0
 #define UIP_CONF_BROADCAST            1