diff --git a/kst.changes b/kst.changes
index 121a441..f4f584b 100644
--- a/kst.changes
+++ b/kst.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 17 13:11:58 UTC 2011 - toddrme2178@gmail.com
+
+- Switched to using KDE macros
+- Switched release build (this is supposed to optimize performance)
+- Cleaned up spec file formatting
+
 -------------------------------------------------------------------
 Wed Sep 14 03:25:55 UTC 2011 - ctrippe@opensuse.org
 
diff --git a/kst.spec b/kst.spec
index f5a4d29..6ebe7c5 100644
--- a/kst.spec
+++ b/kst.spec
@@ -16,30 +16,34 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           kst
-BuildRequires:  gsl-devel readline-devel
-BuildRequires:  cmake
-BuildRequires:  libcfitsio-devel libqt4-devel update-desktop-files
+Version:        2.0.4
+Release:        1
+License:        GPLv2+
+Summary:        Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality
+Url:            http://kst-plot.kde.org/
+Group:          Productivity/Graphics/Visualization/Graph
+Source:         %{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  Mesa-devel
+BuildRequires:  cmake
 BuildRequires:  fdupes
+BuildRequires:  gsl-devel
+BuildRequires:  kde4-filesystem
+BuildRequires:  libcfitsio-devel
 BuildRequires:  libnetcdf-devel
+BuildRequires:  libqt4-devel
+BuildRequires:  readline-devel
+BuildRequires:  update-desktop-files
 %if 0%{?suse_version} > 1130
 BuildRequires:  getdata-devel
 %endif
-License:        GPLv2+
-Group:          Productivity/Graphics/Visualization/Graph
-Summary:        Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality
-Version:        2.0.4
-Release:        1
-Url:            http://kst-plot.kde.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         kst-2.0.4.tar.gz
 
 %description
 Kst is a data plotting and viewing program. Some of the features
-   include: - Robust plotting of live "streaming" data
+   include: 
+
+- Robust plotting of live "streaming" data
 
 - Powerful keyboard and mouse plot manipulation
 
@@ -59,103 +63,55 @@ Kst is a data plotting and viewing program. Some of the features
 
 - Powerful graphical user interface
 
-
-
-Authors:
---------
-    C. Barth Netterfield <kst@omega.astro.utoronto.ca>
-    George Staikos <staikos@kde.org>
-    Andrew Walker <arwalker@sumusltd.com>
-    Rick Chern <rchern@interchange.ubc.ca>
-
 %package devel
-License:        GPLv2+
-Summary:        Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality
-Group:          Productivity/Scientific/Math
-Requires:       kst = %{version}
+Summary:        Development files for %{name}
+Group:          Development/Libraries/KDE
+Requires:       %{name} = %{version}
 Requires:       libqt4-devel
 
 %description devel
-Kst is a data plotting and viewing program. Some of the features
-   include: - Robust plotting of live "streaming" data
+Development libraries and headers needed to build software
+making use of %{name}
 
-- Powerful keyboard and mouse plot manipulation
-
-- Powerful plug-in and extension support
-
-- Large selection of built-in plotting and data manipulation
-   functions, such as histograms, equations, and power spectra
-
-- Color mapping and contour mapping capabilities for
-   three-dimensional data
-
-- Monitoring of events and notification support
-
-- Built-in filtering and curve fitting capabilities
-
-- Convenient command line interface
-
-- Powerful graphical user interface
-
-
-
-Authors:
---------
-    C. Barth Netterfield <kst@omega.astro.utoronto.ca>
-    George Staikos <staikos@kde.org>
-    Andrew Walker <arwalker@sumusltd.com>
-    Rick Chern <rchern@interchange.ubc.ca>
-    Eli Filder <eli@staikos.net>
-    Mike Fenton <mike@staikos.net>
-    Matthew D Truch <matt@truch.net>
-    Nicolas Brisset <Nicolas.Brisset@eurocopter.com>
-    Ted Kisner
-    The University of British Columbia
-    The University of Toronto
-    Sumus Technology Limited
-    Peter Kümmel <syntheticpp@gmx.net>
-    Zongyi Zang
-
-%prep 
-%setup -q -n kst-%{version}
+%prep
+%setup -q
 
 %build
-cmake -Dkst_rpath=0 -Dkst_install_prefix=/usr -Dkst_install_libdir=%{_lib} ./cmake
+EXTRA_FLAGS="-Dkst_install_prefix=%{_kde_prefix} \
+             -Dkst_rpath=0 \
+             -Dkst_install_libdir=%{_lib} \
+             -Dkst_install_plugin_desktop_file_path=%{_kde4_servicesdir}/%{name}
+             -Dkst_release=1"
+%cmake_kde4 -d build -- $EXTRA_FLAGS $RPM_BUILD_DIR/%buildsubdir/cmake
 
 %install
+cd build
 %make_install
-%suse_update_desktop_file kst2 Qt KDE Education Science Math
-%fdupes $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
+cd ..
+%suse_update_desktop_file %{name}2 Qt KDE Education Science Math
+%fdupes %{buildroot}
+%kde_post_install
 
+%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%dir %{_libdir}/kst2  
-%{_bindir}/kst2
-%{_libdir}/libkst*.so.*
-%{_libdir}/kst2/*
-/usr/share/icons/hicolor/*/apps/*kst.*
-/usr/share/applications/kst2.desktop
-/usr/share/applnk/Graphics/kst2.desktop
-/usr/share/mimelink/application/x-kst2.desktop
-/usr/share/man/man1/kst2.1.gz
-%dir /usr/share/applnk
-%dir /usr/share/applnk/Graphics
-%dir /usr/share/icons/hicolor
-%dir /usr/share/icons/hicolor/*
-%dir /usr/share/icons/hicolor/*/apps
-%dir /usr/share/mimelink
-%dir /usr/share/mimelink/application
+%{_kde4_datadir}/applications/%{name}2.desktop
+%{_kde4_bindir}/%{name}2
+%{_kde4_datadir}/applnk/
+%{_kde4_datadir}/mimelink/
+%{_kde4_iconsdir}/hicolor/*/apps/*%{name}.*
+%{_kde4_libdir}/lib%{name}*.so.*
+%{_kde4_libdir}/%{name}2/
+%{_kde4_mandir}/man1/%{name}2.1.gz
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.so
-%{_libdir}/libkst2app.a
+%{_kde4_libdir}/*.so
+%{_kde4_libdir}/lib%{name}2app.a
 
 %changelog