diff --git a/.cvsignore b/.cvsignore
index f544f11..236b5a0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-condor-7.0.2-89891-RH.tar.gz
+condor-7.0.4-95033-RH.tar.gz
diff --git a/condor.spec b/condor.spec
index b6d8ec2..11ff19b 100644
--- a/condor.spec
+++ b/condor.spec
@@ -11,7 +11,7 @@ URL: http://www.cs.wisc.edu/condor/
 # click-through license. Once you have downloaded the source from:
 #   http://parrot.cs.wisc.edu/v7.0.license.html
 # you should process it with generate-tarball.sh:
-#   ./generate-tarball.sh 7.0.2
+#   ./generate-tarball.sh 7.0.4
 # MD5Sum of upstream source:
 #   06eec3ae274b66d233ad050a047f3c91  condor_src-7.0.0-all-all.tar.gz
 #   b08743cfa2e87adbcda042896e8ef537  condor_src-7.0.2-all-all.tar.gz
diff --git a/condor_config.generic.patch b/condor_config.generic.patch
index eb2220c..53fa15c 100644
--- a/condor_config.generic.patch
+++ b/condor_config.generic.patch
@@ -1,8 +1,15 @@
 diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/condor_config.generic
-index 81af317..a8a8335 100644
+index c119679..e795a15 100644
 --- a/src/condor_examples/condor_config.generic
 +++ b/src/condor_examples/condor_config.generic
-@@ -58,12 +58,12 @@ CONDOR_HOST	= central-manager-hostname.your.domain
+@@ -51,19 +51,16 @@
+ ######################################################################
+ ######################################################################
+ 
+-##  What machine is your central manager?
+-CONDOR_HOST	= central-manager-hostname.your.domain
+-
+ ##--------------------------------------------------------------------
  ##  Pathnames:
  ##--------------------------------------------------------------------
  ##  Where have you installed the bin, sbin and lib condor directories?   
@@ -17,7 +24,32 @@ index 81af317..a8a8335 100644
  #LOCAL_DIR		= $(RELEASE_DIR)/hosts/$(HOSTNAME)
  
  ##  Where is the machine-specific local config file for each host?
-@@ -859,10 +859,10 @@ LOG		= $(LOCAL_DIR)/log
+@@ -93,13 +90,13 @@ MAIL			= /usr/bin/mail
+ ##  machines don't share a common UID space, set it to 
+ ##  UID_DOMAIN = $(FULL_HOSTNAME)
+ ##  to specify that each machine has its own UID space.
+-UID_DOMAIN		= your.domain
++UID_DOMAIN		= $(FULL_HOSTNAME)
+ 
+ ##  Internet domain of machines sharing a common file system.
+ ##  If your machines don't use a network file system, set it to
+ ##  FILESYSTEM_DOMAIN = $(FULL_HOSTNAME)
+ ##  to specify that each machine has its own file system. 
+-FILESYSTEM_DOMAIN	= your.domain
++FILESYSTEM_DOMAIN	= $(FULL_HOSTNAME)
+ 
+ ##  This macro is used to specify a short description of your pool. 
+ ##  It should be about 20 characters long. For example, the name of 
+@@ -218,7 +215,7 @@ HOSTALLOW_READ = *
+ ##    HOSTALLOW_WRITE = *
+ ##  but note that this will allow anyone to submit jobs or add
+ ##  machines to your pool and is serious security risk.
+-HOSTALLOW_WRITE = YOU_MUST_CHANGE_THIS_INVALID_CONDOR_CONFIGURATION_VALUE
++HOSTALLOW_WRITE = $(FULL_HOSTNAME)
+ #HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
+ #HOSTDENY_WRITE = bad-machine.your.domain
+ 
+@@ -859,10 +856,10 @@ LOG		= $(LOCAL_DIR)/log
  SPOOL		= $(LOCAL_DIR)/spool
  EXECUTE		= $(LOCAL_DIR)/execute
  BIN		= $(RELEASE_DIR)/bin
diff --git a/sources b/sources
index de7ef40..eec2037 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed525a4464cb5e260eab359b16d19006  condor-7.0.2-89891-RH.tar.gz
+a8da36e4ed1ca11ce2aa7dbefd121766  condor-7.0.4-95033-RH.tar.gz