diff --git a/file b/file
index 0c85ed3a885..e39e55bef12 100755
--- a/file
+++ b/file
@@ -135,7 +135,7 @@ if not len(items):
 
 params = {}
 for x in items:
-    (k, v) = x.split("=")
+    (k, v) = x.split("=",1)
     params[k] = v
 
 state     = params.get('state','file')
diff --git a/get_url b/get_url
index 8bf3cbfbdd6..4d82f8abfcb 100755
--- a/get_url
+++ b/get_url
@@ -60,7 +60,7 @@ def url_do_get(module, url, dest):
 
     if os.path.isdir(dest):
         urlfilename = url_filename(url)
-        actualdest = "%s/%s" % (dest, url_filename(url))
+        actualdest = "%s/%s" % (dest, urlfilename)
         module.params['path'] = actualdest
     else:
          actualdest = dest