diff --git a/setup.py b/setup.py
index 55a705a6..497988cc 100755
--- a/setup.py
+++ b/setup.py
@@ -649,7 +649,6 @@ class Setup():
         ponyshare = conf['share-dir']
         if not ponyshare.endswith('/'):
             ponyshare += '/'
-        ponyshare += 'ponysay/'
         for dir in sharedirs:
             if conf[dir[0]] is not None:
                 self.cp(True, dir[0], [ponyshare + dir[0]], Setup.validateFreedom if self.free else None)
diff --git a/src/ponysay.py b/src/ponysay.py
index 68d6655e..91c78271 100755
--- a/src/ponysay.py
+++ b/src/ponysay.py
@@ -509,10 +509,8 @@ class Ponysay():
                 ponies = {}
                 for ponydir in ponydirs:
                     for pony in Metadata.restrictedPonies(ponydir, logic):
-                        if pony in oldponies: # XXX and (pony not in passed)
-                            ponyfile = ponydir + pony + '.pony'
-                            if oldponies[pony] == ponyfile:
-                                ponies[pony] = ponyfile
+                        if (pony in ponies) and not (pony in ponies): # XXX and (pony not in passed)
+                            ponies[pony] = ponydir + pony + '.pony'
                 if len(ponies) > 0:
                     oldponies = ponies