diff --git a/Dockerfile b/Dockerfile
index 494add3..d69c821 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,6 +61,7 @@ RUN \
       Mopidy-Iris \
       Mopidy-Local \
       Mopidy-MPD \
+      Mopidy-Jellyfin \
       Mopidy-Spotify-Web \
       Mopidy-SoundCloud \
   && echo "* Cleaning up" \
diff --git a/root/defaults/mopidy.conf b/root/defaults/mopidy.conf
index f8a99e5..c62b82f 100644
--- a/root/defaults/mopidy.conf
+++ b/root/defaults/mopidy.conf
@@ -45,9 +45,15 @@ image_dir = /data/.images
 
 [http]
 hostname = 0.0.0.0
+port = 6680
 
 [mpd]
+enabled = true
+# Useful if you want to control this instance from a remote MPD client
 hostname = 0.0.0.0
+port = 6600
+# This will help avoid timeout errors for  artists or folders with large amounts of files
+connection_timeout = 300
 
 [iris]
 country = GB
@@ -76,3 +82,9 @@ auth_token =
 [scrobbler]
 username =
 password =
+
+[jellyfin]
+hostname = 172.17.0.1
+username = mopidy
+password = 66Hky1XQL1oTg
+libraries = Music