diff --git a/mapserver.spec b/mapserver.spec
index ff90aaf..9e3b385 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -119,6 +119,15 @@ Requires:       %{name} = %{version}-%{release}
 The Java/Mapscript extension provides full map customization capabilities
 within the Java programming language.
 
+%package	devel
+Summary:        Mapserver development files
+Group:          Productivity/Scientific/Other
+Requires:       %{name} = %{version}-%{release}
+
+%description	devel
+The Mapserver development package provides necessary files to build
+against the C Mapserver library.
+
 %prep
 %setup -q -n %{name}-%{fileversion}
 
@@ -163,27 +172,15 @@ within the Java programming language.
 # using %{?_smp_mflags} may break build
 
 make
-# temporary hack!
 make mapscriptvars
-#sed -i -e "s;libdir='%{_libdir}';libdir='%{buildroot}%{_libdir}';" libmapserver.la
-#sed -i -e "s;libdir='%{python_sitearch}';libdir='%{buildroot}%{python_sitearch}';" mapscript/python/_mapscript.la
-#sed -i -e "s;libdir='/usr/lib64/php/modules';libdir='%{buildroot}/usr/lib64/php/modules';" mapscript/php/php_mapscript.la
 
 ## build perl
 cd mapscript/perl
 perl Makefile.PL
 make
 
-## build python
-#cd ../python
-#python setup.py build
-
 # build java
-#touch ../mapscript.i
 cd ../java
-#JAVA_HOME=%{java_home} make
-#sed -i -e "s;libdir='%{_libdir}';libdir='%{buildroot}%{_libdir}';" libjavamapscript.la
-#make interface
 make
 
 %install
@@ -195,36 +192,20 @@ mkdir -p %{buildroot}/%{_sysconfdir}/php.d
 mkdir -p %{buildroot}%{_libdir}/php5/extensions
 mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}%{python_sitearch}/
+mkdir -p %{buildroot}/%{_includedir}/mapserver
+cp *.h %{buildroot}/%{_includedir}/mapserver/
 
 make DESTDIR=%{buildroot} install
 
 cp %{buildroot}%{_bindir}/mapserv %{buildroot}%{_cgibindir}/mapserv
 cp %{buildroot}%{_bindir}/legend %{buildroot}%{_cgibindir}/legend
 cp %{buildroot}%{_bindir}/scalebar %{buildroot}%{_cgibindir}/scalebar
-#install -p -m 755 shp2img %{buildroot}%{_bindir}
-#install -p -m 755 shptree %{buildroot}%{_bindir}
-#install -p -m 755 sortshp %{buildroot}%{_bindir}
-#install -p -m 755 tile4ms %{buildroot}%{_bindir}
-
-#install -p -m 755 mapscript/php/.libs/php_mapscript.so %{buildroot}/%{_libdir}/php5/extensions/
-
-
 
 # install perl module
 pushd mapscript/perl
 make DESTDIR=%{buildroot} pure_vendor_install
 popd
 
-# install python module
-#pushd mapscript/python
-
-#python setup.py install --root %{buildroot}
-#mv %{buildroot}/usr/local/%{_lib}/python%py_ver/site-packages/*mapscript* %{buildroot}/usr/%{_lib}/python%py_ver/site-packages/
-#%if 0%{?suse_version} > 1110 || 0%{?sles_version} > 10
-#    mv %{buildroot}/usr/local/%{_lib}/python%py_ver/site-packages/MapScript* %{buildroot}/usr/%{_lib}/python%py_ver/site-packages/
-#%endif
-#popd
-
 # install java
 mkdir -p %{buildroot}%{_javadir}
 install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
@@ -262,7 +243,6 @@ rm -rf %{buildroot}
 %{_bindir}/mapserv
 %{_bindir}/legend
 %{_bindir}/scalebar
-%{_bindir}/mapserver-config
 %{_bindir}/msencrypt
 %{_bindir}/shptreetst
 %{_bindir}/shptreevis
@@ -270,7 +250,6 @@ rm -rf %{buildroot}
 %{_cgibindir}/legend
 %{_cgibindir}/scalebar
 %{_libdir}/libmapserver-6.*.so
-%{_libdir}/libmapserver.la
 %{_libdir}/libmapserver.so
 
 %files -n php-mapserver
@@ -305,4 +284,11 @@ rm -rf %{buildroot}
 %doc mapscript/java/tests
 %{_javadir}/*.jar
 
+%files devel
+%defattr(-,root,root)
+%{_bindir}/mapserver-config
+%{_libdir}/libmapserver.la
+%dir %{_includedir}/mapserver
+%{_includedir}/mapserver/*
+
 %changelog