diff --git a/devel/Makefile b/devel/Makefile
index 20b6e6dcf57e..44987823ae08 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -603,6 +603,7 @@
     SUBDIR += libsigsegv
     SUBDIR += libslang
     SUBDIR += libslang2
+    SUBDIR += libslang2-devel
     SUBDIR += libsoup
     SUBDIR += libsoup-reference
     SUBDIR += libstatgrab
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 1b326a669892..e427d7e1c17f 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFLICTS=	libslang2-2.* libslang-1.*.j[0-9]
+CONFLICTS=	libslang2-[0-9]* libslang2-devel-[0-9]* libslang-1.*.j[0-9]
 
 ALL_TARGET=	all elf
 INSTALL_TARGET=	install install-elf
diff --git a/devel/libslang2-devel/Makefile b/devel/libslang2-devel/Makefile
index 389ff4b35a0d..fa2013d93f42 100644
--- a/devel/libslang2-devel/Makefile
+++ b/devel/libslang2-devel/Makefile
@@ -1,18 +1,17 @@
-# New ports collection makefile for:	libslang2
-# Date created:		2005-05-16
-# Whom:			Renato Botelho <freebsd@galle.com.br>
+# New ports collection makefile for:	libslang2-devel
+# Date created:		2007-02-24
+# Whom:			garga
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libslang2
-PORTVERSION=	2.0.7
+PORTVERSION=	20070224
 CATEGORIES=	devel
-MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v2.0/ \
-		ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.0/ \
-		ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.0/ \
-		ftp://ftp.plig.org/pub/slang/v2.0/
-DISTNAME=	slang-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	garga/slang
+PKGNAMESUFFIX=	-devel
+DISTNAME=	slang2${PKGNAMESUFFIX}-${PORTVERSION}
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Routines for rapid alpha-numeric terminal applications development
diff --git a/devel/libslang2-devel/distinfo b/devel/libslang2-devel/distinfo
index 9d5baf9a6ca8..25520b5e66c9 100644
--- a/devel/libslang2-devel/distinfo
+++ b/devel/libslang2-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (slang-2.0.7.tar.bz2) = 522d9075a721ebe235211dc96c7db2d1
-SHA256 (slang-2.0.7.tar.bz2) = 61402410b60d8c64c349c5f875bc6a69bf881074494c1a1351032d6873ad10f5
-SIZE (slang-2.0.7.tar.bz2) = 1085744
+MD5 (slang2-devel-20070224.tar.bz2) = 33577633aa174f1618437120c96854a7
+SHA256 (slang2-devel-20070224.tar.bz2) = 06c97e23697e567b83a69c5b33f6631178a618ffb5d88510228e509bf5663601
+SIZE (slang2-devel-20070224.tar.bz2) = 1132419
diff --git a/devel/libslang2-devel/pkg-descr b/devel/libslang2-devel/pkg-descr
index 596b830eb7a9..78a7bdc5c819 100644
--- a/devel/libslang2-devel/pkg-descr
+++ b/devel/libslang2-devel/pkg-descr
@@ -9,4 +9,6 @@ The most exciting feature of the library is the slang
 interpreter that may be easily embedded into a program to
 make it extensible. 
 
+This is development version.
+
 WWW:	http://www.jedsoft.org/slang/
diff --git a/devel/libslang2-devel/pkg-plist b/devel/libslang2-devel/pkg-plist
index 791de2b2fa4d..d41cf5ac800f 100644
--- a/devel/libslang2-devel/pkg-plist
+++ b/devel/libslang2-devel/pkg-plist
@@ -50,6 +50,8 @@ lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/print.sl
 %%DATADIR%%/profile.sl
 %%DATADIR%%/require.sl
+%%DATADIR%%/rline/complete.sl
+%%DATADIR%%/rline/slrline.rc
 %%DATADIR%%/scripts/jpegsize
 %%DATADIR%%/scripts/lsrpm
 %%DATADIR%%/scripts/sldb
@@ -58,14 +60,17 @@ lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/select.sl
 %%DATADIR%%/sldb.sl
 %%DATADIR%%/sldbcore.sl
+%%DATADIR%%/sldbsock.sl
 %%DATADIR%%/slshrl.sl
 %%DATADIR%%/slsmg.sl
+%%DATADIR%%/slshhelp.sl
 %%DATADIR%%/socket.sl
 %%DATADIR%%/stkcheck.sl
 %%DATADIR%%/structfuns.sl
 %%DATADIR%%/termios.sl
 %%DATADIR%%/varray.sl
 @dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/rline
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/cmaps
 @dirrmtry %%DATADIR%%/local-packages
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 389ff4b35a0d..367387788e68 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-CONFLICTS=	libslang-1.*
+CONFLICTS=	libslang-[0-9]* libslang2-devel-[0-9]*
 
 ALL_TARGET=	all elf
 INSTALL_TARGET=	install install-elf
diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile
index 5e1faa39364b..fa18ffe838f9 100644
--- a/japanese/libslang/Makefile
+++ b/japanese/libslang/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	slang-${VERSION}jp${JP_VERSION}
 MAINTAINER=	iwashita@cqmail.net
 COMMENT=	A library permits a programmer to develop software
 
-CONFLICTS=	libslang2-2.* libslang-1.*[^j]*
+CONFLICTS=	libslang2-[0-9]* libslang2-devel-[0-9]* libslang-1.*[^j]*
 
 VERSION=	1.4.5
 JP_VERSION=	2