diff --git a/QScintilla-2-gpl-Qt4-incpath.patch b/QScintilla-2-gpl-Qt4-incpath.patch
deleted file mode 100644
index b64f995..0000000
--- a/QScintilla-2-gpl-Qt4-incpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- QScintilla-gpl-2.2/designer-Qt4/designer.pro.BAD	2008-07-18 13:22:40.000000000 -0500
-+++ QScintilla-gpl-2.2/designer-Qt4/designer.pro	2008-07-18 13:23:02.000000000 -0500
-@@ -12,4 +12,6 @@
- target.path = $$[QT_INSTALL_PLUGINS]/designer
- INSTALLS += target
- 
--LIBS += -lqscintilla2
-+LIBS += -L$(DESTDIR)../Qt4 -lqscintilla2
-+
-+INCPATH = $(DESTDIR)../Qt4
diff --git a/QScintilla-gpl-2.4-autocomplete_popup.patch b/QScintilla-gpl-2.4-autocomplete_popup.patch
new file mode 100644
index 0000000..885452c
--- /dev/null
+++ b/QScintilla-gpl-2.4-autocomplete_popup.patch
@@ -0,0 +1,12 @@
+diff -up QScintilla-gpl-2.4/Qt4/SciClasses.cpp.autocomplete_popup QScintilla-gpl-2.4/Qt4/SciClasses.cpp
+--- QScintilla-gpl-2.4/Qt4/SciClasses.cpp.autocomplete_popup	2009-06-05 04:00:41.000000000 -0500
++++ QScintilla-gpl-2.4/Qt4/SciClasses.cpp	2009-10-21 07:56:58.804972430 -0500
+@@ -128,7 +128,7 @@ void SciPopup::on_triggered(int cmd)
+ SciListBox::SciListBox(QWidget *parent, ListBoxQt *lbx_)
+     : QListWidget(parent), lbx(lbx_)
+ {
+-    setWindowFlags(Qt::Tool|Qt::FramelessWindowHint);
++    setWindowFlags(Qt::ToolTip|Qt::WindowStaysOnTopHint);
+     setAttribute(Qt::WA_StaticContents);
+ 
+     setFocusProxy(parent);
diff --git a/QScintilla-gpl-2.4-qt4_designer_incpath.patch b/QScintilla-gpl-2.4-qt4_designer_incpath.patch
new file mode 100644
index 0000000..a113968
--- /dev/null
+++ b/QScintilla-gpl-2.4-qt4_designer_incpath.patch
@@ -0,0 +1,11 @@
+diff -up QScintilla-gpl-2.4/designer-Qt4/designer.pro.qt4_designer_incpath QScintilla-gpl-2.4/designer-Qt4/designer.pro
+--- QScintilla-gpl-2.4/designer-Qt4/designer.pro.qt4_designer_incpath	2009-05-03 11:26:12.000000000 -0500
++++ QScintilla-gpl-2.4/designer-Qt4/designer.pro	2009-10-21 08:01:56.561731098 -0500
+@@ -12,4 +12,6 @@ SOURCES = qscintillaplugin.cpp
+ target.path = $$[QT_INSTALL_PLUGINS]/designer
+ INSTALLS += target
+ 
+-LIBS += -lqscintilla2
++LIBS += -L$(DESTDIR)../Qt4 -lqscintilla2
++
++INCPATH = $(DESTDIR)../Qt4
diff --git a/qscintilla.spec b/qscintilla.spec
index fe00239..494d995 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 4%{?dist}
+Release: 7%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -15,8 +15,11 @@ Url:     http://www.riverbankcomputing.com/software/qscintilla/
 Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz  
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# TODO: upstream this
-Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
+## Upstreamable patches
+# posted to upstream ml, not in archive yet
+Patch50: QScintilla-gpl-2.4-qt4_designer_incpath.patch 
+# http://www.riverbankcomputing.com/pipermail/qscintilla/2009-October/000496.html
+Patch51: QScintilla-gpl-2.4-autocomplete_popup.patch
 
 Obsoletes: qscintilla-designer < 2.4-3
 Provides:  qscintilla-designer = %{version}-%{release}
@@ -26,7 +29,7 @@ BuildRequires:  qt4-devel
 # for -python
 %if 0%{?python}
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%global pyqt4_version 4.5
+%global pyqt4_version 4.6.1
 BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
 BuildRequires:  chrpath
 %endif
@@ -70,7 +73,8 @@ Obsoletes: qscintilla-python-devel < 2.4-4
 %prep
 %setup -q -n QScintilla-gpl-%{version}
 
-%patch1 -p1 -b .designer-incpath-qt4
+%patch50 -p1 -b .qt4_designer_incpath
+%patch51 -p1 -b .autocomplete_popup
 
 # fix permissions on doc files
 find doc example-Qt4  -type f -exec chmod 0644 {} ';'
@@ -93,10 +97,11 @@ popd
 
 %if 0%{?python}
 pushd Python
-%{__python} configure.py \
-            -c -j 3 \
-            -n ../Qt4 \
-            -o ../Qt4
+%{__python} \
+  configure.py \
+    -c -j 3 \
+    -n ../Qt4 \
+    -o ../Qt4
 make %{?_smp_mflags}
 popd
 %endif
@@ -152,6 +157,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Nov 11 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.4-7
+- pyqt4_version 4.6.1
+
+* Wed Oct 21 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.4-6
+- autocomplete_popup patch
+
+* Fri Oct 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.4-5
+- rebuild (PyQt4)
+
 * Tue Aug 11 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.4-4
 - -python-devel: make noarch, drop dep on -python