diff --git a/man/rhnplugin.conf.5 b/man/rhnplugin.conf.5
index fa29e7c..0de8bc1 100644
--- a/man/rhnplugin.conf.5
+++ b/man/rhnplugin.conf.5
@@ -37,6 +37,9 @@ Either `0' or `1'. Determines whether gpg signature checking will be performed
 on packages coming from Spacewalk/Red Hat Satellite. Default value is `1'. If this option
 is not set, the value from \fByum.conf\fP(5) will be used.
 
+.IP \fBtimeout\fR
+The amount of time (in seconds) that you want to wait for a response before timing out. If this option is not set, the value from \fByum.conf\fP(5) will be used.
+
 .SH FILES
 
 .IP \fI/etc/yum/pluginconf.d/rhnplugin.conf\fP
diff --git a/rhnplugin.conf b/rhnplugin.conf
index 076aa38..4522165 100644
--- a/rhnplugin.conf
+++ b/rhnplugin.conf
@@ -1,6 +1,7 @@
 [main]
 enabled = 0
 gpgcheck = 1
+timeout = 120
 
 # You can specify options per channel, e.g.:
 #
diff --git a/rhnplugin.py b/rhnplugin.py
index 0d3e80a..3cbd355 100644
--- a/rhnplugin.py
+++ b/rhnplugin.py
@@ -66,7 +66,7 @@ def init_hook(conduit):
     RHN_DISABLED = _("Red Hat Satellite or RHN Classic support will be disabled.")
 
     conduit_conf = conduit.getConf()
-    timeout = conduit_conf.timeout
+    timeout = conduit.confFloat('main', 'timeout', conduit_conf.timeout)
 
     if not os.geteuid()==0:
         # If non-root notify user Spacewalk repo not accessible
@@ -269,7 +269,8 @@ def posttrans_hook(conduit):
     """ Post rpm transaction hook. We update the RHN profile here. """
     global rhn_enabled
     if rhn_enabled:
-        timeout = conduit.getConf().timeout
+        timeout = conduit.confFloat('main', 'timeout',
+                conduit.getConf().timeout)
         up2date_cfg = config.initUp2dateConfig()
         if up2date_cfg.has_key('writeChangesToLog') and up2date_cfg['writeChangesToLog'] == 1:
             ts_info = conduit.getTsInfo()
diff --git a/yum-rhn-plugin.spec b/yum-rhn-plugin.spec
index 54a943d..5178223 100644
--- a/yum-rhn-plugin.spec
+++ b/yum-rhn-plugin.spec
@@ -1,7 +1,7 @@
 Summary: Spacewalk support for yum
 Name: yum-rhn-plugin
 Version: 2.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -70,6 +70,9 @@ fi
 %doc LICENSE
 
 %changelog
+* Mon Sep 09 2013 Stephen Herr <sherr@redhat.com> 2.0.1-2
+- Resolves: #1006045 - keep yum-rhn-plugins higher default timeout
+
 * Wed Jul 17 2013 Tomas Kasparek <tkasparek@redhat.com> 2.0.1-1
 - Bumping package versions for 2.0.