diff --git a/fetch_test.go b/fetch_test.go
index efcebcc..3f7d1a9 100644
--- a/fetch_test.go
+++ b/fetch_test.go
@@ -9,6 +9,8 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
+	"strings"
 	"testing"
 	"time"
 
@@ -56,6 +58,26 @@ func TestClone_unpacked(t *testing.T) {
 	rmDir(t, cloneAndCheckout(t, "ipfs://ipfs/QmYFpZJs82hLTyEpwkzVpaXGUabVVwiT8yrd6TK81XnoGB/unpackedTest", expectedClone))
 }
 
+func TestClone_ipnsPublished(t *testing.T) {
+	bareHash := "Qmf4ZzbmnqyKEjuBH3hNpQWu1fMUZWdy91DwAsUXXc4Kw1" // == /ipfs/QmYFpZJs82hLTyEpwkzVpaXGUabVVwiT8yrd6TK81XnoGB/unpackedTest
+	id, err := ipfsShell.ID()
+	checkFatal(t, err)
+	//err = ipfsShell.Publish(id.ID, bareHash)
+	err = ipfsShell.Publish("", bareHash)
+	checkFatal(t, err)
+	tmpDir := cloneAndCheckout(t, "ipfs://ipns/"+id.ID, expectedClone)
+	// check origin url
+	cmd := exec.Command(gitPath, "config", "--get", "remote.origin.url")
+	cmd.Dir = tmpDir
+	out, err := cmd.CombinedOutput()
+	checkFatal(t, err)
+	origin := strings.TrimSpace(string(out))
+	if origin != "ipfs://ipfs/"+bareHash {
+		t.Fatalf("remote url wasn't set correctly. is:%q", origin)
+	}
+	rmDir(t, tmpDir)
+}
+
 // helpers
 
 func cloneAndCheckout(t *testing.T, repo string, expected map[string]string) (tmpDir string) {
@@ -74,7 +96,8 @@ func cloneAndCheckout(t *testing.T, repo string, expected map[string]string) (tm
 
 func checkFatal(t *testing.T, err error) {
 	if err != nil {
-		t.Fatal(err)
+		_, file, line, _ := runtime.Caller(1)
+		t.Fatalf("error from %s:%d.\n%s", file, line, err)
 	}
 }
 
diff --git a/main.go b/main.go
index b37a6f6..97e83cc 100644
--- a/main.go
+++ b/main.go
@@ -105,6 +105,17 @@ func main() {
 			log.Debug("prefix cut:", u)
 		}
 	}
+	for _, pref := range []string{"ipfs://ipns/", "ipfs:///ipns/"} {
+		if strings.HasPrefix(u, pref) {
+			current, err := ipfsShell.ResolvePath("/ipns/" + u[len(pref):])
+			if err != nil {
+				log.Fatal("ipns resolve for current version failed:", err)
+			}
+			log.Warnln("can't push to ipns addresses - using current hash. resolved to:", current)
+			u = current
+		}
+	}
+
 	p, err := path.ParsePath(u)
 	if err != nil {
 		log.Fatalf("path.ParsePath() failed: %s", err)