diff --git a/puppet/zulip/manifests/postgres_appdb.pp b/puppet/zulip/manifests/postgres_appdb.pp
index f5d22a1931..9faf8b58a8 100644
--- a/puppet/zulip/manifests/postgres_appdb.pp
+++ b/puppet/zulip/manifests/postgres_appdb.pp
@@ -35,6 +35,14 @@ class zulip::postgres_appdb {
     notify => Service[supervisor],
   }
 
+  file { '/usr/share/postgresql/9.1/tsearch_data/en_us.dict':
+    ensure => 'link',
+    target => '/var/cache/postgresql/dicts/en_us.dict',
+  }
+  file { '/usr/share/postgresql/9.1/tsearch_data/en_us.affix':
+    ensure => 'link',
+    target => '/var/cache/postgresql/dicts/en_us.affix',
+  }
   file { "/usr/share/postgresql/9.1/tsearch_data/zulip_english.stop":
     require => Package["postgresql-9.1"],
     ensure => file,
diff --git a/scripts/setup/create-database b/scripts/setup/create-database
index 91b5cef059..17c7d6f1a0 100755
--- a/scripts/setup/create-database
+++ b/scripts/setup/create-database
@@ -1,8 +1,5 @@
 #!/bin/sh -xe
 
-ln -s /var/cache/postgresql/dicts/en_us.dict /usr/share/postgresql/9.1/tsearch_data/en_us.dict
-ln -s /var/cache/postgresql/dicts/en_us.affix /usr/share/postgresql/9.1/tsearch_data/en_us.affix
-
 echo "DROP SCHEMA zulip CASCADE; CREATE SCHEMA zulip;" | python manage.py dbshell
 
 python manage.py syncdb --noinput