diff --git a/.cvsignore b/.cvsignore
index bc6ec7c..31f32b1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pgadmin3-1.6.3.tar.gz
+pgadmin3-1.8.0.tar.gz
diff --git a/pgadmin3.spec b/pgadmin3.spec
index 5e28c18..631917f 100644
--- a/pgadmin3.spec
+++ b/pgadmin3.spec
@@ -1,32 +1,54 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.6.3
+Version:	1.8.0
 Release:	1%{?dist}
-
 License:	Artistic
 Group:		Applications/Databases
-Source:     ftp://ftp.postgresql.org/pub/pgadmin3/release/v1.6.1/src/pgadmin3-1.6.3.tar.gz
+Source:		ftp://ftp.postgresql.org/pub/pgadmin3/release/v1.8.0/src/pgadmin3-1.8.0.tar.gz
 URL:		http://www.pgadmin.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel libxml2-devel libxslt-devel
+BuildRequires:	wxGTK-devel postgresql-devel desktop-file-utils openssl-devel libxml2-devel libxslt-devel
+Requires:	wxGTK
 
 %description
-pgAdmin III is a comprehensive PostgreSQL database design
-and management system for *nix and Windows systems.
+pgAdmin III is a powerful administration and development
+platform for the PostgreSQL database, free for any use.
+It is designed to answer the needs of all users,
+from writing simple SQL queries to developing complex
+databases. The graphical interface supports all PostgreSQL
+features and makes administration easy.
+
+pgAdmin III is designed to answer the needs of all users, 
+from writing simple SQL queries to developing complex databases. 
+The graphical interface supports all PostgreSQL features and 
+makes administration easy. The application also includes a syntax 
+highlighting SQL editor, a server-side code editor, an 
+SQL/batch/shell job scheduling agent, support for the Slony-I 
+replication engine and much more. No additional drivers are 
+required to communicate with the database server.
+
+%package docs
+Summary:	Documentation for pgAdmin3
+Group:		Applications/Databases
+Requires:	%{name} = %{version}
+
+%description docs
+This package contains documentation for various languages,
+which are in html format.
 
 %prep
 %setup -q
 
 %build
 export LIBS="-lwx_gtk2u_core-2.8"
-%configure --with-wx-version=2.8
-make %{?_smp_mflags}
+%configure --disable-debug --with-wx-version=2.8 --with-wx=/usr
+make %{?_smp_mflags} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
-cp -f ./src/include/images/elephant48.xpm $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}.xpm
+cp -f ./pkg/debian/pgadmin3.xpm $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}.xpm
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 
@@ -47,7 +69,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 
+%files docs
+%defattr(-,root,root)
+%doc docs/*
+
 %changelog
+
+* Wed Nov 14 2007 Devrim GUNDUZ <devrim@commandprompt.com> 1.8.0-1
+- Update to 1.8.0
+- Fix requires and buildrequires
+- Improve description
+- Added -docs subpackage
+- add 2 new configure options, per upstream
+- Fix path for xpm file
+
 * Wed Apr 04 2007 Warren Togami <wtogami@redhat.com> - 1.6.3-1
 - 1.6.3
 
diff --git a/sources b/sources
index 716d912..15eb5ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3ab37cec763895b05803338f09331e4  pgadmin3-1.6.3.tar.gz
+fdcf7b211971790db4f5f5c5081a63f8  pgadmin3-1.8.0.tar.gz