diff --git a/src/servers/net/Jamfile b/src/servers/net/Jamfile
index 7b73065dba..e746628d22 100644
--- a/src/servers/net/Jamfile
+++ b/src/servers/net/Jamfile
@@ -7,11 +7,6 @@ UsePrivateHeaders net ;
 UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libppp headers ] ;
 UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ;
 UseHeaders [ FDirName $(OBOS_TOP) src tests kits net DialUpPreflet ] ;
-UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp pppoe ] ; # PPPoE
-UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp ipcp ] ; # IPCP
-
-# additional sources for built-in add-ons:
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src tests kits net DialUpPreflet ] ;
 
 
 Server net_server :
@@ -23,16 +18,6 @@ Server net_server :
 	# built-in add-ons
 	PPPServer.cpp
 	
-	# PPPServer needs this
-	DialUpView.cpp
-	InterfaceUtils.cpp
-	MessageDriverSettingsUtils.cpp
-	TextRequestDialog.cpp
-	ConnectionOptionsAddon.cpp
-	GeneralAddon.cpp
-	IPCPAddon.cpp
-	PPPoEAddon.cpp
-	
 	# old net_server (was a netstack tester app)
 #	userland_server.c
 #	userland_ipc.c 
@@ -42,5 +27,8 @@ LinkSharedOSLibs net_server :
 	be 
 	libsocket.so
 	libbind.so
+	
+	# for PPP
+	libdunview.a
 	libppp.a
 ;
diff --git a/src/servers/net/NetServer.cpp b/src/servers/net/NetServer.cpp
index 525ff0e8e5..cfc7c2c58a 100644
--- a/src/servers/net/NetServer.cpp
+++ b/src/servers/net/NetServer.cpp
@@ -1,9 +1,7 @@
-//-----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//
-//  Copyright (c) 2004 Waldemar Kornewald, Waldemar.Kornewald@web.de
-//-----------------------------------------------------------------------
+/*
+ * Copyright 2004, Waldemar Kornewald <Waldemar.Kornewald@web.de>
+ * Distributed under the terms of the MIT License.
+ */
 
 #include "NetServer.h"
 #include <Application.h>
diff --git a/src/servers/net/NetServer.h b/src/servers/net/NetServer.h
index 15263c6a20..6f8d74c8ac 100644
--- a/src/servers/net/NetServer.h
+++ b/src/servers/net/NetServer.h
@@ -1,9 +1,7 @@
-//-----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//
-//  Copyright (c) 2004 Waldemar Kornewald, Waldemar.Kornewald@web.de
-//-----------------------------------------------------------------------
+/*
+ * Copyright 2004, Waldemar Kornewald <Waldemar.Kornewald@web.de>
+ * Distributed under the terms of the MIT License.
+ */
 
 #ifndef _NET_SERVER__H
 #define _NET_SERVER__H
diff --git a/src/servers/net/PPPServer.cpp b/src/servers/net/PPPServer.cpp
index dc807e0208..61641e457e 100644
--- a/src/servers/net/PPPServer.cpp
+++ b/src/servers/net/PPPServer.cpp
@@ -1,9 +1,7 @@
-//-----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//
-//  Copyright (c) 2004 Waldemar Kornewald, Waldemar.Kornewald@web.de
-//-----------------------------------------------------------------------
+/*
+ * Copyright 2004, Waldemar Kornewald <Waldemar.Kornewald@web.de>
+ * Distributed under the terms of the MIT License.
+ */
 
 #include "PPPServer.h"
 #include "SimpleMessageFilter.h"
@@ -47,8 +45,6 @@ PPPServer::MessageReceived(BMessage *message)
 			HandleReportMessage(message);
 		break;
 		
-		// TODO: handle 
-		
 		default:
 			BHandler::MessageReceived(message);
 	}
@@ -90,7 +86,7 @@ PPPServer::HandleReportMessage(BMessage *message)
 		switch(code) {
 			case PPP_REPORT_GOING_UP: {
 				if(AskBeforeDialing(id)) {
-//					OpenDialRequestWindow(id, sender);
+					OpenDialRequestWindow(id, sender);
 					return;
 				}
 			} break;
@@ -101,3 +97,10 @@ PPPServer::HandleReportMessage(BMessage *message)
 	
 	send_data(sender, B_OK, NULL, 0);
 }
+
+
+void
+PPPServer::OpenDialRequestWindow(ppp_interface_id id, thread_id sender)
+{
+	
+}
diff --git a/src/servers/net/PPPServer.h b/src/servers/net/PPPServer.h
index 382cd922cd..5ae3beaf09 100644
--- a/src/servers/net/PPPServer.h
+++ b/src/servers/net/PPPServer.h
@@ -1,9 +1,7 @@
-//-----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//
-//  Copyright (c) 2004 Waldemar Kornewald, Waldemar.Kornewald@web.de
-//-----------------------------------------------------------------------
+/*
+ * Copyright 2004, Waldemar Kornewald <Waldemar.Kornewald@web.de>
+ * Distributed under the terms of the MIT License.
+ */
 
 #ifndef _PPP_SERVER__H
 #define _PPP_SERVER__H
@@ -27,6 +25,7 @@ class PPPServer : public BHandler {
 		bool AskBeforeDialing(ppp_interface_id id);
 		
 		void HandleReportMessage(BMessage *message);
+		void OpenDialRequestWindow(ppp_interface_id id, thread_id sender);
 
 	private:
 		SimpleMessageFilter *fFilter;
diff --git a/src/servers/net/SimpleMessageFilter.cpp b/src/servers/net/SimpleMessageFilter.cpp
index 13c76bf49d..b5f59a8824 100644
--- a/src/servers/net/SimpleMessageFilter.cpp
+++ b/src/servers/net/SimpleMessageFilter.cpp
@@ -1,9 +1,7 @@
-//-----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//
-//  Copyright (c) 2004 Waldemar Kornewald, Waldemar.Kornewald@web.de
-//-----------------------------------------------------------------------
+/*
+ * Copyright 2004, Waldemar Kornewald <Waldemar.Kornewald@web.de>
+ * Distributed under the terms of the MIT License.
+ */
 
 /*!	\class SimpleMessageFilter
 	\brief This is a BMessageFilter that can filter multiple \a what values.
diff --git a/src/servers/net/SimpleMessageFilter.h b/src/servers/net/SimpleMessageFilter.h
index 428907a5cd..6f8bcf6661 100644
--- a/src/servers/net/SimpleMessageFilter.h
+++ b/src/servers/net/SimpleMessageFilter.h
@@ -1,9 +1,7 @@
-//-----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//
-//  Copyright (c) 2004 Waldemar Kornewald, Waldemar.Kornewald@web.de
-//-----------------------------------------------------------------------
+/*
+ * Copyright 2004, Waldemar Kornewald <Waldemar.Kornewald@web.de>
+ * Distributed under the terms of the MIT License.
+ */
 
 #ifndef _SIMPLE_MESSAGE_FILTER__H
 #define _SIMPLE_MESSAGE_FILTER__H