diff --git a/python-cmd2.spec b/python-cmd2.spec
index 5734c03..aaafc34 100644
--- a/python-cmd2.spec
+++ b/python-cmd2.spec
@@ -1,19 +1,18 @@
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%if 0%{?fedora}
 %global with_python3 1
 %endif
 
 %global modname cmd2
 
 Name:             python-cmd2
-Version:          0.6.4
-Release:          7%{?dist}
+Version:          0.6.7
+Release:          1%{?dist}
 Summary:          Extra features for standard library's cmd module
 
 Group:            Development/Libraries
 License:          MIT
 URL:              http://pypi.python.org/pypi/cmd2
 Source0:          http://pypi.python.org/packages/source/c/%{modname}/%{modname}-%{version}.tar.gz
-Patch0:           silent-editor-check.patch
 
 BuildArch:        noarch
 
@@ -87,7 +86,6 @@ See docs at http://packages.python.org/cmd2/
 
 %prep
 %setup -q -n %{modname}-%{version}
-%patch0 -p1
 
 chmod -x README.txt
 dos2unix README.txt
@@ -136,6 +134,11 @@ popd
 
 
 %changelog
+* Thu Nov 14 2013 Ralph Bean <rbean@redhat.com> - 0.6.7-1
+- Latest upstream.
+- Drop patch which has been upstreamed.
+- Modernized python3 macro def.
+
 * Tue Jul 30 2013 Pádraig Brady <pbrady@redhat.com> - 0.6.4-7
 - Suppress warnings about missing editors when $EDITOR not set
 
diff --git a/silent-editor-check.patch b/silent-editor-check.patch
deleted file mode 100644
index eb2f94e..0000000
--- a/silent-editor-check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bitbucket.org/catherinedevlin/cmd2/issue/1/silent-editor-check
-
-From 590a9dfd32fa729d05d474ac81bccc7eebf6b9bd Mon Sep 17 00:00:00 2001
-From: Martin Magr <mmagr@redhat.com>
-Date: Tue, 29 Jan 2013 13:54:15 +0100
-Subject: [PATCH] Added vi as possible editor and made editor check silent.
-
-Fixes: rhbz#889774
----
- cmd2.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/cmd2.py b/cmd2.py
-index ba7fab8..85ad9c8 100755
---- a/cmd2.py
-+++ b/cmd2.py
-@@ -420,9 +420,14 @@ class Cmd(cmd.Cmd):
-         if sys.platform[:3] == 'win':
-             editor = 'notepad'
-         else:
--            for editor in ['gedit', 'kate', 'vim', 'emacs', 'nano', 'pico']:
--                if subprocess.Popen(['which', editor], stdout=subprocess.PIPE).communicate()[0]:
-+            for editor in ['gedit', 'kate', 'vim', 'vi', 'emacs', 'nano', 'pico']:
-+                _proc = subprocess.Popen(['which', editor],
-+                                         stdout=subprocess.PIPE,
-+                                         stderr=subprocess.STDOUT)
-+                if _proc.communicate()[0]:
-                     break
-+            else:
-+                editor = None
- 
-     colorcodes =    {'bold':{True:'\x1b[1m',False:'\x1b[22m'},
-                   'cyan':{True:'\x1b[36m',False:'\x1b[39m'},
--- 
-1.7.11.7
-