diff --git a/Copyright b/Copyright
index 30fdb1d4bb..842846e50c 100644
--- a/Copyright
+++ b/Copyright
@@ -51,7 +51,7 @@ License:    GNU General Public License
 Name:       libdvdcss
 Version:    Subversion r202 (post 1.2.9 release)
 Homepage:   http://developers.videolan.org/libdvdcss/
-Directory:  libmpdvdkit2
+Directory:  libdvdcss
 Copyright:  1998-2006 VideoLAN
 License:    GNU General Public License
 
diff --git a/Makefile b/Makefile
index 751ba680dd..3a1b7aae6c 100644
--- a/Makefile
+++ b/Makefile
@@ -116,6 +116,7 @@ PARTS += libfame
 endif
 ifeq ($(DVDKIT2),yes)
 PARTS += libmpdvdkit2
+PARTS += libdvdcss
 endif
 ifeq ($(GUI),yes)
 PARTS += Gui
@@ -175,6 +176,8 @@ endif
 ifeq ($(DVDKIT2),yes)
 COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
 COMMON_LIBS += libmpdvdkit2/libmpdvdkit.a
+COMMON_DEPS += libdvdcss/libdvdcss.a
+COMMON_LIBS += libdvdcss/libdvdcss.a
 endif
 ifeq ($(CONFIG_ASS),yes)
 COMMON_DEPS += libass/libass.a
@@ -207,6 +210,9 @@ libaf/libaf.a:
 libmpdvdkit2/libmpdvdkit.a:
 	$(MAKE) -C libmpdvdkit2
 
+libdvdcss/libdvdcss.a:
+	$(MAKE) -C libdvdcss
+
 loader/libloader.a:
 	$(MAKE) -C loader
 
@@ -476,6 +482,7 @@ input/libinput.a: .norecurse $(wildcard input/*.[ch])
 libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch])
 libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
 libmpdvdkit2/libmpdvdkit.a: .norecurse $(wildcard libmpdvdkit2/*.[ch])
+libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
 
 libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
 stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch])
diff --git a/libdvdcss/Makefile b/libdvdcss/Makefile
new file mode 100644
index 0000000000..6e0d3ee0bf
--- /dev/null
+++ b/libdvdcss/Makefile
@@ -0,0 +1,63 @@
+
+ifneq ($(wildcard ../config.mak),)
+include ../config.mak
+endif
+
+SRCS = css.c \
+       device.c \
+       error.c \
+       ioctl.c \
+       libdvdcss.c \
+       #bsdi_ioctl \
+
+OBJS = $(SRCS:.c=.o)
+
+LIB=libdvdcss
+
+.SUFFIXES: .c .o
+
+ifeq ($(OPTFLAGS),)
+OPTFLAGS = -mcpu=pentium -march=pentium -O4
+endif
+
+#	 \ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+
+# -funroll-loops  removed, triggered gcc 3.0.4 (3.x?) bug
+CFLAGS= -I.. $(OPTFLAGS) -D__USE_UNIX98 -D_GNU_SOURCE \
+	-DHAVE_LIMITS_H -DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \
+	-DVERSION=\"1.2.9\"
+
+ifeq ($(TARGET_OS),CYGWIN)
+CFLAGS+=-DSYS_CYGWIN -DWIN32
+endif
+
+ifeq ($(TARGET_OS),Darwin)
+CFLAGS+=-D__DARWIN__
+endif
+
+.c.o:
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+all: $(LIB).a
+
+$(LIB).a: $(OBJS)
+	$(AR) rc $(LIB).a $(OBJS)
+	$(RANLIB) $(LIB).a
+
+clean:
+	rm -f *.o *.a *~ *.so
+
+distclean: clean
+	rm -f .depend
+
+dep:    depend
+
+depend:
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
diff --git a/libmpdvdkit2/bsdi_dvd.h b/libdvdcss/bsdi_dvd.h
similarity index 100%
rename from libmpdvdkit2/bsdi_dvd.h
rename to libdvdcss/bsdi_dvd.h
diff --git a/libmpdvdkit2/bsdi_ioctl.c b/libdvdcss/bsdi_ioctl.c
similarity index 100%
rename from libmpdvdkit2/bsdi_ioctl.c
rename to libdvdcss/bsdi_ioctl.c
diff --git a/libmpdvdkit2/common.h b/libdvdcss/common.h
similarity index 100%
rename from libmpdvdkit2/common.h
rename to libdvdcss/common.h
diff --git a/libmpdvdkit2/css.c b/libdvdcss/css.c
similarity index 100%
rename from libmpdvdkit2/css.c
rename to libdvdcss/css.c
diff --git a/libmpdvdkit2/css.h b/libdvdcss/css.h
similarity index 100%
rename from libmpdvdkit2/css.h
rename to libdvdcss/css.h
diff --git a/libmpdvdkit2/csstables.h b/libdvdcss/csstables.h
similarity index 100%
rename from libmpdvdkit2/csstables.h
rename to libdvdcss/csstables.h
diff --git a/libmpdvdkit2/device.c b/libdvdcss/device.c
similarity index 100%
rename from libmpdvdkit2/device.c
rename to libdvdcss/device.c
diff --git a/libmpdvdkit2/device.h b/libdvdcss/device.h
similarity index 100%
rename from libmpdvdkit2/device.h
rename to libdvdcss/device.h
diff --git a/libmpdvdkit2/dvdcss/dvdcss.h b/libdvdcss/dvdcss/dvdcss.h
similarity index 100%
rename from libmpdvdkit2/dvdcss/dvdcss.h
rename to libdvdcss/dvdcss/dvdcss.h
diff --git a/libmpdvdkit2/error.c b/libdvdcss/error.c
similarity index 100%
rename from libmpdvdkit2/error.c
rename to libdvdcss/error.c
diff --git a/libmpdvdkit2/ioctl.c b/libdvdcss/ioctl.c
similarity index 100%
rename from libmpdvdkit2/ioctl.c
rename to libdvdcss/ioctl.c
diff --git a/libmpdvdkit2/ioctl.h b/libdvdcss/ioctl.h
similarity index 100%
rename from libmpdvdkit2/ioctl.h
rename to libdvdcss/ioctl.h
diff --git a/libmpdvdkit2/libdvdcss.c b/libdvdcss/libdvdcss.c
similarity index 100%
rename from libmpdvdkit2/libdvdcss.c
rename to libdvdcss/libdvdcss.c
diff --git a/libmpdvdkit2/libdvdcss.h b/libdvdcss/libdvdcss.h
similarity index 100%
rename from libmpdvdkit2/libdvdcss.h
rename to libdvdcss/libdvdcss.h
diff --git a/libmpdvdkit2/FILES b/libmpdvdkit2/FILES
deleted file mode 100644
index 6714ab48ce..0000000000
--- a/libmpdvdkit2/FILES
+++ /dev/null
@@ -1,48 +0,0 @@
-On the origin of the files:
-==========================
-
-The code is a mixture of libdvdread and libdvdcss.
-
-libdvdread 0.9.4:
-----------------
-bswap.h
-dvd_input.c
-dvd_input.h
-dvd_reader.c
-dvd_reader.h
-dvd_udf.c
-dvd_udf.h
-ifo_print.c
-ifo_print.h
-ifo_read.c
-ifo_read.h
-ifo_types.h
-md5.c
-md5.h
-nav_print.c
-nav_print.h
-nav_read.c
-nav_read.h
-nav_types.h
-
-libdvdcss 1.2.9:
-----------------
-bsdi_dvd.h
-bsdi_ioctl.c
-common.h
-config.h
-css.c
-css.h
-csstables.h
-device.c
-device.h
-dvdcss/dvdcss.h
-error.c
-ioctl.c
-ioctl.h
-libdvdcss.c
-libdvdcss.h
-
-Additional MPlayer-specific changes are contained in libdvdread_changes.diff
-and libdvdcss_changes.diff.
-This file should be updated with each modification of the code.
diff --git a/libmpdvdkit2/Makefile b/libmpdvdkit2/Makefile
index 1d70d50eb1..169b10812a 100644
--- a/libmpdvdkit2/Makefile
+++ b/libmpdvdkit2/Makefile
@@ -3,16 +3,11 @@ ifneq ($(wildcard ../config.mak),)
 include ../config.mak
 endif
 
-SRCS = css.c \
-       device.c \
-       dvd_input.c \
+SRCS = dvd_input.c \
        dvd_reader.c \
        dvd_udf.c \
-       error.c \
        ifo_print.c \
        ifo_read.c \
-       ioctl.c \
-       libdvdcss.c \
        nav_print.c \
        nav_read.c \
        md5.c \
@@ -34,18 +29,8 @@ endif
 #	 \ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
 # -funroll-loops  removed, triggered gcc 3.0.4 (3.x?) bug
-CFLAGS= -I.. $(OPTFLAGS) -D__USE_UNIX98 -D_GNU_SOURCE \
+CFLAGS= -I../libdvdcss -I.. $(OPTFLAGS) -D__USE_UNIX98 -D_GNU_SOURCE \
 	-DHAVE_DVDCSS_DVDCSS_H -DSTDC_HEADERS -DHAVE_LIMITS_H \
-	-DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \
-	-DVERSION=\"1.2.9\"
-
-ifeq ($(TARGET_OS),CYGWIN)
-CFLAGS+=-DSYS_CYGWIN -DWIN32
-endif
-
-ifeq ($(TARGET_OS),Darwin)
-CFLAGS+=-D__DARWIN__
-endif
 
 .c.o:
 	$(CC) $(CFLAGS) -c -o $@ $<