diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index b344a6b7b7..06b3d8c1af 100644
--- a/libraries/Makefile.in
+++ b/libraries/Makefile.in
@@ -4,8 +4,12 @@
 ##
 ## Libraries Makefile for OpenLDAP
 
-SUBDIRS= liblutil liblber \
-	liblunicode libldif \
+SUBDIRS= \
+	liblutil \
+	liblber \
+	liblunicode \
 	libldap libldap_r \
-	libavl libldbm librewrite
+	libavl \
+	libldbm \
+	librewrite
 
diff --git a/libraries/libldif/Makefile.in b/libraries/libldif/Makefile.in
deleted file mode 100644
index 66fbb37126..0000000000
--- a/libraries/libldif/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-##
-## Makefile for -lldif
-##
-
-LIBRARY	= libldif.a
-SRCS	= line64.c fetch.c
-OBJS	= line64.o fetch.o
-
-LDAP_INCDIR= ../../include       
-LDAP_LIBDIR= ../../libraries
-
diff --git a/libraries/libldif/libldif.dsp b/libraries/libldif/libldif.dsp
deleted file mode 100644
index 112f5658f1..0000000000
--- a/libraries/libldif/libldif.dsp
+++ /dev/null
@@ -1,141 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libldif" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libldif - Win32 Single Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libldif.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libldif.mak" CFG="libldif - Win32 Single Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libldif - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libldif - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "libldif - Win32 Single Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "libldif - Win32 Single Release" (based on\
- "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-
-!IF  "$(CFG)" == "libldif - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\Release"
-# PROP Intermediate_Dir "..\..\Release\libldif"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\Release\oldif32.lib"
-
-!ELSEIF  "$(CFG)" == "libldif - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\Debug"
-# PROP Intermediate_Dir "..\..\Debug\libldif"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\Debug\oldif32.lib"
-
-!ELSEIF  "$(CFG)" == "libldif - Win32 Single Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "libldif_"
-# PROP BASE Intermediate_Dir "libldif_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\SDebug"
-# PROP Intermediate_Dir "..\..\SDebug\libldif"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\Debug\oldif32.lib"
-# ADD LIB32 /nologo /out:"..\..\SDebug\oldif32.lib"
-
-!ELSEIF  "$(CFG)" == "libldif - Win32 Single Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "libldif0"
-# PROP BASE Intermediate_Dir "libldif0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\SRelease"
-# PROP Intermediate_Dir "..\..\SRelease\libldif"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\Release\oldif32.lib"
-# ADD LIB32 /nologo /out:"..\..\SRelease\oldif32.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libldif - Win32 Release"
-# Name "libldif - Win32 Debug"
-# Name "libldif - Win32 Single Debug"
-# Name "libldif - Win32 Single Release"
-# Begin Source File
-
-SOURCE=.\fetch.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ldif.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\line64.c
-# End Source File
-# End Target
-# End Project
diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in
index b8e27695f9..238b1a68ea 100644
--- a/libraries/liblutil/Makefile.in
+++ b/libraries/liblutil/Makefile.in
@@ -15,10 +15,12 @@ UNIX_OBJS = detach.o
 
 SRCS	= base64.c csn.c entropy.c sasl.c signal.c hash.c passfile.c \
 	md5.c passwd.c sha1.c getpass.c lockf.c utils.c uuid.c sockpair.c \
+	ldif.c fetch.c \
 	@LIBSRCS@ $(@PLAT@_SRCS)
 
 OBJS	= base64.o csn.o entropy.o sasl.o signal.o hash.o passfile.o \
 	md5.o passwd.o sha1.o getpass.o lockf.o utils.o uuid.o sockpair.o \
+	ldif.o fetch.o \
 	@LIBOBJS@ $(@PLAT@_OBJS)
 
 LDAP_INCDIR= ../../include       
diff --git a/libraries/libldif/fetch.c b/libraries/liblutil/fetch.c
similarity index 68%
rename from libraries/libldif/fetch.c
rename to libraries/liblutil/fetch.c
index cb4d81beed..01ff18320d 100644
--- a/libraries/libldif/fetch.c
+++ b/libraries/liblutil/fetch.c
@@ -1,8 +1,22 @@
-/* line64.c - routines for dealing with the slapd line format */
+/* fetch.c - routines for fetching data at URLs */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Portions Copyright 1999-2003 Kurt D. Zeilenga.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* This work was initially developed by Kurt D. Zeilenga for
+ * inclusion in OpenLDAP Software.
  */
 
 #include "portable.h"
diff --git a/libraries/libldif/line64.c b/libraries/liblutil/ldif.c
similarity index 91%
rename from libraries/libldif/line64.c
rename to libraries/liblutil/ldif.c
index b82933d971..ce6c85e567 100644
--- a/libraries/libldif/line64.c
+++ b/libraries/liblutil/ldif.c
@@ -1,8 +1,30 @@
-/* line64.c - routines for dealing with the slapd line format */
+/* ldif.c - routines for dealing with LDIF files */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.  This
+ * software is provided ``as is'' without express or implied warranty.
+ */
+/* This work was originally developed by the University of Michigan
+ * and distributed as part of U-MICH LDAP.
  */
 
 #include "portable.h"
diff --git a/libraries/librewrite/Makefile.in b/libraries/librewrite/Makefile.in
index b8a487192f..f8e55bfd86 100644
--- a/libraries/librewrite/Makefile.in
+++ b/libraries/librewrite/Makefile.in
@@ -21,7 +21,7 @@ LIBRARY = librewrite.a
 PROGRAMS	= rewrite
 XLIBS = $(LIBRARY) $(LDAP_LIBAVL_A) $(LDAP_LIBLUTIL_A) \
 	$(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
-XXLIBS  = $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
+XXLIBS  = $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS)
 
 rewrite:	$(XLIBS) rewrite.o parse.o