diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index dfddef17354..8acd0beb191 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2001/10/31 08:11:06 kevlo Exp $
+# $OpenBSD: Makefile,v 1.6 2001/12/18 06:18:33 kevlo Exp $
 
 COMMENT=	"desktop planetarium"
 
-DISTNAME=	kstars-0.7
+DISTNAME=	kstars-0.8.2
 CATEGORIES=	astro
-NEED_VERSION=	1.483
+NEED_VERSION=	1.502
 
 HOMEPAGE=	http://kstars.sourceforge.net/
 
@@ -18,8 +18,7 @@ PERMIT_DISTFILES_FTP=  Yes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kstars
 
-BUILD_DEPENDS=	::devel/automake \
-		::x11/qt2-designer
+BUILD_DEPENDS=	::x11/qt2-designer
 
 LIB_DEPENDS=	kdecore.3,DCOP,kio,kfile,kdeui,kdesu,kssl,ksycoca::x11/kde/libs2
 
@@ -30,11 +29,14 @@ MAKE_ENV=	${CONFIGURE_ENV}
 MAKE_FLAGS=	CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
 
 USE_X11=	Yes
-CONFIGURE_STYLE= autoconf
+USE_GMAKE=	Yes
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	 ${MODQT_CONFIGURE_ARGS}
 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${LOCALBASE} 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/admin
 
+WRKDIST=	${WRKDIR}/kstars-0.8
+
 .include <bsd.port.mk>
diff --git a/astro/kstars/distinfo b/astro/kstars/distinfo
new file mode 100644
index 00000000000..efa1bb25ee6
--- /dev/null
+++ b/astro/kstars/distinfo
@@ -0,0 +1,3 @@
+MD5 (kstars-0.8.2.tar.gz) = 9c13d29b405123b818771570f8649e06
+RMD160 (kstars-0.8.2.tar.gz) = b7218e5f976c40848bbece4c3e33e0b2f3677523
+SHA1 (kstars-0.8.2.tar.gz) = fc8e9299e82781eaf5a8c0b73396fe46b6639d0b
diff --git a/astro/kstars/files/md5 b/astro/kstars/files/md5
deleted file mode 100644
index 0c9449fc161..00000000000
--- a/astro/kstars/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (kstars-0.7.tar.gz) = 49fc6efd17e04b845cc2f9541bb07e45
-RMD160 (kstars-0.7.tar.gz) = 245001def717cf4a32500721c2869a837830d584
-SHA1 (kstars-0.7.tar.gz) = 9db510911e9367209518920c62511d7f32af32cf
diff --git a/astro/kstars/patches/patch-aclocal_m4 b/astro/kstars/patches/patch-aclocal_m4
deleted file mode 100644
index 2ce87e09154..00000000000
--- a/astro/kstars/patches/patch-aclocal_m4
+++ /dev/null
@@ -1,19 +0,0 @@
---- aclocal.m4.orig	Sat Oct  6 09:51:32 2001
-+++ aclocal.m4	Sat Oct  6 09:53:09 2001
-@@ -1,4 +1,4 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p4
- 
- dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -4510,6 +4510,10 @@
-     lt_cv_file_magic_cmd='/usr/bin/file -L'
-     lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-   fi
-+  ;;
-+
-+openbsd* )
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- osf3* | osf4* | osf5*)
diff --git a/astro/kstars/patches/patch-admin_ltcf-c_sh b/astro/kstars/patches/patch-admin_ltcf-c_sh
deleted file mode 100644
index 58bec179881..00000000000
--- a/astro/kstars/patches/patch-admin_ltcf-c_sh
+++ /dev/null
@@ -1,19 +0,0 @@
---- admin/ltcf-c.sh.orig	Sat Oct  6 11:01:07 2001
-+++ admin/ltcf-c.sh	Sat Oct  6 11:03:19 2001
-@@ -398,10 +398,14 @@
-     ;;
- 
-   openbsd*)
--    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_libdir_flag_spec='-R$libdir'
-+    archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
-+    hardcode_libdir_flag_spec='${wl}-R$libdir'
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-+    remove_lgcc=yes
-+    output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-     ;;
- 
-   os2*)
diff --git a/astro/kstars/patches/patch-admin_ltcf-cxx_sh b/astro/kstars/patches/patch-admin_ltcf-cxx_sh
deleted file mode 100644
index a5f9af84041..00000000000
--- a/astro/kstars/patches/patch-admin_ltcf-cxx_sh
+++ /dev/null
@@ -1,22 +0,0 @@
---- admin/ltcf-cxx.sh.orig	Sat Oct  6 11:03:50 2001
-+++ admin/ltcf-cxx.sh	Sat Oct  6 11:06:11 2001
-@@ -339,6 +339,19 @@
-       ld_shlibs=no
-     fi
-     ;;
-+  openbsd*)
-+    if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-+      # MM: OpenBSD 2.7 uses G++, but not GNU ld
-+      archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
-+      hardcode_libdir_flag_spec='${wl}-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      remove_lgcc=yes
-+      output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-+    fi
-+    ;;
-   osf3*)
-     if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
diff --git a/astro/kstars/patches/patch-configure b/astro/kstars/patches/patch-configure
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/astro/kstars/patches/patch-kstars_data_Makefile_am b/astro/kstars/patches/patch-kstars_data_Makefile_am
deleted file mode 100644
index af51467fb87..00000000000
--- a/astro/kstars/patches/patch-kstars_data_Makefile_am
+++ /dev/null
@@ -1,26 +0,0 @@
---- kstars/data/Makefile.am.orig	Sat Oct  6 12:32:08 2001
-+++ kstars/data/Makefile.am	Sat Oct  6 12:35:06 2001
-@@ -17,17 +17,17 @@
- 	$(mkinstalldirs) $(kde_datadir)/kstars/
- 	$(INSTALL_DATA) $(srcdir)/sao.dat $(kde_datadir)/kstars/sao.dat
- 	$(mkinstalldirs) $(kde_icondir)/hicolor/16x16/apps/
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kstars.png $(kde_icondir)/hicolor/16x16/apps/kstars.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kstars.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kstars.png
- 	$(mkinstalldirs) $(kde_icondir)/hicolor/32x32/apps/
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(kde_icondir)/hicolor/32x32/apps/kstars.png  
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kstars.png  
- 	$(mkinstalldirs) $(kde_icondir)/hicolor/48x48/apps/
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kstars.png $(kde_icondir)/hicolor/48x48/apps/kstars.png
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kstars.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kstars.png
- 	$(mkinstalldirs) $(kde_icondir)/locolor/16x16/apps/
--	$(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(kde_icondir)/locolor/16x16/apps/kstars.png 
-+	$(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kstars.png 
- 	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
--	$(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(kde_icondir)/locolor/32x32/apps/kstars.png 
-+	$(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kstars.png 
- 	$(mkinstalldirs) $(kde_icondir)/locolor/48x48/apps/
--	$(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(kde_icondir)/locolor/48x48/apps/kstars.png 
-+	$(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/48x48/apps/kstars.png 
- 	$(mkinstalldirs) $(kde_datadir)/kstars/
- 	$(INSTALL_DATA) $(srcdir)/geomap.png $(kde_datadir)/kstars/geomap.png
- 	$(mkinstalldirs) $(kde_datadir)/kstars/
diff --git a/astro/kstars/patches/patch-kstars_data_Makefile_in b/astro/kstars/patches/patch-kstars_data_Makefile_in
new file mode 100644
index 00000000000..f4d435eba74
--- /dev/null
+++ b/astro/kstars/patches/patch-kstars_data_Makefile_in
@@ -0,0 +1,34 @@
+--- kstars/data/Makefile.in.orig	Thu Dec 13 18:50:09 2001
++++ kstars/data/Makefile.in	Tue Dec 18 12:47:54 2001
+@@ -350,7 +350,7 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/
+ #>- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(kde_icondir)/hicolor/32x32/apps/kstars.png  
+ #>+ 1
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(kde_icondir)/hicolor/32x32/apps/kstars.png  $(DESTDIR)
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kstars.png 
+ #>- 	$(mkinstalldirs) $(kde_icondir)/hicolor/48x48/apps/
+ #>+ 1
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/
+@@ -362,19 +362,19 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/
+ #>- 	$(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(kde_icondir)/locolor/16x16/apps/kstars.png 
+ #>+ 1
+-	$(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(kde_icondir)/locolor/16x16/apps/kstars.png $(DESTDIR)
++	$(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kstars.png 
+ #>- 	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
+ #>+ 1
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/
+ #>- 	$(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(kde_icondir)/locolor/32x32/apps/kstars.png 
+ #>+ 1
+-	$(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(kde_icondir)/locolor/32x32/apps/kstars.png $(DESTDIR)
++	$(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kstars.png 
+ #>- 	$(mkinstalldirs) $(kde_icondir)/locolor/48x48/apps/
+ #>+ 1
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/48x48/apps/
+ #>- 	$(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(kde_icondir)/locolor/48x48/apps/kstars.png 
+ #>+ 1
+-	$(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(kde_icondir)/locolor/48x48/apps/kstars.png $(DESTDIR)
++	$(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/48x48/apps/kstars.png 
+ #>- 	$(mkinstalldirs) $(kde_datadir)/kstars/
+ #>+ 1
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kstars/
diff --git a/astro/kstars/pkg/PLIST b/astro/kstars/pkg/PLIST
index c25043e3a2d..f258c2686df 100644
--- a/astro/kstars/pkg/PLIST
+++ b/astro/kstars/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/10/31 08:11:10 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.3 2001/12/18 06:21:05 kevlo Exp $
 bin/kstars
 share/applnk/Applications/kstars.desktop
 share/apps/kstars/Cities.dat
+share/apps/kstars/chart.colors
 share/apps/kstars/clines.dat
 share/apps/kstars/cnames.dat
+share/apps/kstars/default.colors
 share/apps/kstars/earth.B0.vsop
 share/apps/kstars/earth.B1.vsop
 share/apps/kstars/earth.B2.vsop
@@ -198,7 +200,17 @@ share/apps/kstars/moon8.png
 share/apps/kstars/moon9.png
 share/apps/kstars/moonB.dat
 share/apps/kstars/moonLR.dat
-share/apps/kstars/mw.dat
+share/apps/kstars/mw01.dat
+share/apps/kstars/mw02.dat
+share/apps/kstars/mw03.dat
+share/apps/kstars/mw04.dat
+share/apps/kstars/mw05.dat
+share/apps/kstars/mw06.dat
+share/apps/kstars/mw07.dat
+share/apps/kstars/mw08.dat
+share/apps/kstars/mw09.dat
+share/apps/kstars/mw10.dat
+share/apps/kstars/mw11.dat
 share/apps/kstars/neptune.B0.vsop
 share/apps/kstars/neptune.B1.vsop
 share/apps/kstars/neptune.B2.vsop
@@ -218,6 +230,7 @@ share/apps/kstars/neptune.R3.vsop
 share/apps/kstars/neptune.R4.vsop
 share/apps/kstars/neptune.png
 share/apps/kstars/ngc2000.dat
+share/apps/kstars/night.colors
 share/apps/kstars/pluto.freq
 share/apps/kstars/pluto.png
 share/apps/kstars/pluto.x
@@ -280,11 +293,38 @@ share/apps/kstars/venus.R3.vsop
 share/apps/kstars/venus.R4.vsop
 share/apps/kstars/venus.R5.vsop
 share/apps/kstars/venus.png
+share/doc/HTML/en/kstars/ai-contents.docbook
+share/doc/HTML/en/kstars/astroinfo.docbook
+share/doc/HTML/en/kstars/commands.docbook
 share/doc/HTML/en/kstars/common
+share/doc/HTML/en/kstars/config.docbook
+share/doc/HTML/en/kstars/cpoles.docbook
+share/doc/HTML/en/kstars/credits.docbook
+share/doc/HTML/en/kstars/csphere.docbook
+share/doc/HTML/en/kstars/ecliptic.docbook
+share/doc/HTML/en/kstars/equinox.docbook
+share/doc/HTML/en/kstars/faq.docbook
+share/doc/HTML/en/kstars/geocoords.docbook
+share/doc/HTML/en/kstars/greatcircle.docbook
+share/doc/HTML/en/kstars/horizon.docbook
+share/doc/HTML/en/kstars/hourangle.docbook
 share/doc/HTML/en/kstars/index.docbook
+share/doc/HTML/en/kstars/install.docbook
+share/doc/HTML/en/kstars/julianday.docbook
+share/doc/HTML/en/kstars/leapyear.docbook
+share/doc/HTML/en/kstars/meridian.docbook
+share/doc/HTML/en/kstars/precession.docbook
+share/doc/HTML/en/kstars/quicktour.docbook
+share/doc/HTML/en/kstars/retrograde.docbook
 share/doc/HTML/en/kstars/screen1.png
 share/doc/HTML/en/kstars/screen2.png
 share/doc/HTML/en/kstars/screen3.png
+share/doc/HTML/en/kstars/screen4.png
+share/doc/HTML/en/kstars/sidereal.docbook
+share/doc/HTML/en/kstars/skycoords.docbook
+share/doc/HTML/en/kstars/timezones.docbook
+share/doc/HTML/en/kstars/utime.docbook
+share/doc/HTML/en/kstars/zenith.docbook
 share/icons/hicolor/16x16/apps/kstars.png
 share/icons/hicolor/32x32/apps/kstars.png
 share/icons/hicolor/48x48/apps/kstars.png