diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 57dfc69b9f..cc780451a8 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-19	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* libnetworking/lib/ftpfs.c: Do not fall back to BOOTP server address
+	in case hostname was not specified.
+
 2010-10-19	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* libnetworking/lib/ftpfs.c: Fixed a special case with no username and
diff --git a/cpukit/libnetworking/lib/ftpfs.c b/cpukit/libnetworking/lib/ftpfs.c
index 1b633aa94d..00467e5e9b 100644
--- a/cpukit/libnetworking/lib/ftpfs.c
+++ b/cpukit/libnetworking/lib/ftpfs.c
@@ -604,10 +604,7 @@ static int rtems_ftpfs_open_ctrl_connection(
   }
 
   /* Set up the server address from the hostname */
-  if (hostname == NULL || strlen(hostname) == 0) {
-    /* Default to BOOTP server address */
-    address = rtems_bsdnet_bootp_server_address;
-  } else if (inet_aton(hostname, &address) == 0) {
+  if (inet_aton(hostname, &address) == 0) {
     /* Try to get the address by name */
     struct hostent *he = gethostbyname(hostname);