diff --git a/README.md b/README.md
index 2197a95..9e5ee38 100644
--- a/README.md
+++ b/README.md
@@ -157,6 +157,8 @@ Languages:
   - [x] thumbnail/preview
   - [x] multiple lines description (see [issue 4](https://git.lecygnenoir.info/LecygneNoir/prismedia/issues/4))
   - [ ] add videos to playlist (YT & PT workflow: upload video, find playlist id, add video to playlist)
+   - [x] Peertube
+   - [ ] Youtube
 - [x] Use a config file (NFO) file to retrieve videos arguments
 - [x] Allow to choose peertube or youtube upload (to resume failed upload for example)
 - [x] Add publishAt option to plan your videos (need the [atd](https://linux.die.net/man/8/atd) daemon, [curl](https://linux.die.net/man/1/curl) and [jq](https://stedolan.github.io/jq/))
@@ -169,4 +171,4 @@ Languages:
 If your server uses peertube before 1.0.0-beta4, use the version inside tag 1.0.0-beta3!
 
 ## Sources 
-inspired by [peeror](https://git.drycat.fr/rigelk/Peeror) and [youtube-upload](https://github.com/tokland/youtube-upload)
\ No newline at end of file
+inspired by [peeror](https://git.rigelk.eu/rigelk/peeror) and [youtube-upload](https://github.com/tokland/youtube-upload)
\ No newline at end of file
diff --git a/lib/pt_upload.py b/lib/pt_upload.py
index fa3225d..4dd6143 100644
--- a/lib/pt_upload.py
+++ b/lib/pt_upload.py
@@ -48,18 +48,58 @@ def get_authenticated_service(secret):
     return oauth
 
 
+def get_default_playlist(user_info):
+    return user_info['videoChannels'][0]['id']
+
+
+def get_playlist_by_name(user_info, options):
+    for playlist in user_info["videoChannels"]:
+        if playlist['displayName'] == options.get('--playlist'):
+            return playlist['id']
+
+
+def create_playlist(oauth, url, options):
+    template = ('Peertube : Playlist %s does not exist, creating it.')
+    logging.info(template % (str(options.get('--playlist'))))
+    data = '{"displayName":"' + str(options.get('--playlist')) +'", \
+            "description":null}'
+
+    headers = {
+        'Content-Type': "application/json"
+    }
+    try:
+        response = oauth.post(url + "/api/v1/video-channels/",
+                       data=data,
+                       headers=headers)
+    except Exception as e:
+        if hasattr(e, 'message'):
+            logging.error("Error: " + str(e.message))
+        else:
+            logging.error("Error: " + str(e))
+    if response is not None:
+        if response.status_code == 200:
+            jresponse = response.json()
+            jresponse = jresponse['videoChannel']
+            return jresponse['id']
+        else:
+            logging.error(('Peertube : The upload failed with an unexpected response: '
+                           '%s') % response)
+            exit(1)
+
+
 def upload_video(oauth, secret, options):
 
     def get_userinfo():
-        user_info = json.loads(oauth.get(url + "/api/v1/users/me").content)
-        return str(user_info["id"])
+        return json.loads(oauth.get(url+"/api/v1/users/me").content)
 
     def get_file(path):
         mimetypes.init()
         return (basename(path), open(abspath(path), 'rb'),
                 mimetypes.types_map[splitext(path)[1]])
 
-    url = str(secret.get('peertube', 'peertube_url')).rstrip('/')
+    path = options.get('--file')
+    url = secret.get('peertube', 'peertube_url')
+    user_info = get_userinfo()
 
     # We need to transform fields into tuple to deal with tags as
     # MultipartEncoder does not support list refer
@@ -70,8 +110,7 @@ def upload_video(oauth, secret, options):
         ("licence", "1"),
         ("description", options.get('--description')  or "default description"),
         ("nsfw", str(int(options.get('--nsfw')) or "0")),
-        ("channelId", get_userinfo()),
-        ("videofile", get_file(options.get('--file')))
+        ("videofile", get_file(path))
     ]
 
     if options.get('--tags'):
@@ -115,12 +154,22 @@ def upload_video(oauth, secret, options):
         fields.append(("thumbnailfile", get_file(options.get('--thumbnail'))))
         fields.append(("previewfile", get_file(options.get('--thumbnail'))))
 
+    if options.get('--playlist'):
+        playlist_id = get_playlist_by_name(user_info, options)
+        if not playlist_id and options.get('--playlistCreate'):
+            playlist_id = create_playlist(oauth, url, options)
+        elif not playlist_id:
+            logging.warning("Playlist `" + options.get('--playlist') + "` is unknown, using default playlist.")
+            playlist_id = get_default_playlist(user_info)
+    else:
+        playlist_id = get_default_playlist(user_info)
+    fields.append(("channelId", str(playlist_id)))
+
     multipart_data = MultipartEncoder(fields)
 
     headers = {
         'Content-Type': multipart_data.content_type
     }
-
     response = oauth.post(url + "/api/v1/videos/upload",
                           data=multipart_data,
                           headers=headers)
diff --git a/prismedia_upload.py b/prismedia_upload.py
index 27d8b8d..04473d8 100755
--- a/prismedia_upload.py
+++ b/prismedia_upload.py
@@ -37,6 +37,10 @@ Options:
   --thumbnail=STRING    Path to a file to use as a thumbnail for the video.
                         Supported types are jpg and jpeg.
                         By default, prismedia search for an image based on video name followed by .jpg or .jpeg
+  --playlist=STRING Set the playlist to use for the video. Also known as Channel for Peertube.
+                    If the playlist is not found, spawn an error except if --playlist-create is set.
+  --playlistCreate  Create the playlist if not exists. (default do not create)
+                    Only relevant if --playlist is set.
   -h --help  Show this help.
   --version  Show version.
 
@@ -211,6 +215,8 @@ if __name__ == '__main__':
         Optional('--thumbnail'): Or(None, And(
                                     str, validateThumbnail, error='thumbnail is not supported, please use jpg/jpeg'),
                                     ),
+        Optional('--playlist'): Or(None, str),
+        Optional('--playlistCreate'): bool,
         '--help': bool,
         '--version': bool
     })