diff --git a/qtox.pro b/qtox.pro
index 19b2817eb..960a78412 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -160,7 +160,7 @@ win32 {
         QMAKE_INFO_PLIST = osx/info.plist
         QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
         LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lvpx -lopus -framework OpenAL -lavformat -lavdevice -lavcodec -lavutil -lswscale -mmacosx-version-min=10.7
-        LIBS += -framework AVFoundation -framework Foundation
+        LIBS += -framework AVFoundation -framework Foundation -framework CoreMedia
         LIBS += -lqrencode -lsqlcipher
         contains(DEFINES, QTOX_PLATFORM_EXT) { LIBS += -framework IOKit -framework CoreFoundation }
         contains(DEFINES, QTOX_FILTER_AUDIO) { LIBS += -lfilteraudio }
diff --git a/src/platform/camera/avfoundation.mm b/src/platform/camera/avfoundation.mm
index ce008b9e7..5f625e17e 100644
--- a/src/platform/camera/avfoundation.mm
+++ b/src/platform/camera/avfoundation.mm
@@ -28,7 +28,7 @@ QVector<QPair<QString, QString> > avfoundation::getDeviceList()
 
     NSArray* devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
     for (AVCaptureDevice* device in devices) {
-        result.append({ QString::number([devices indexOfObject:device]), [[device localizedName] UTF8String] });
+        result.append({ QString::fromUtf8([[device uniqueID] UTF8String]), QString::fromUtf8([[device localizedName] UTF8String]) });
     }
 
     return result;
@@ -38,5 +38,33 @@ QVector<VideoMode> avfoundation::getDeviceModes(QString devName)
 {
     QVector<VideoMode> result;
 
+    NSArray* devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+    AVCaptureDevice* device = nil;
+
+    for (AVCaptureDevice* dev in devices) {
+        if (devName == QString::fromUtf8([[dev uniqueID] UTF8String])) {
+            device = dev;
+            break;
+        }
+    }
+    if (device == nil) {
+        return result;
+    }
+
+    for (AVCaptureDeviceFormat* format in [device formats]) {
+        CMFormatDescriptionRef formatDescription;
+        CMVideoDimensions dimensions;
+        formatDescription = (CMFormatDescriptionRef)[format performSelector:@selector(formatDescription)];
+        dimensions = CMVideoFormatDescriptionGetDimensions(formatDescription);
+
+        for (AVFrameRateRange* range in format.videoSupportedFrameRateRanges) {
+            VideoMode mode;
+            mode.width = dimensions.width;
+            mode.height = dimensions.height;
+            mode.FPS = range.maxFrameRate;
+            result.append(mode);
+        }
+    }
+
     return result;
 }
diff --git a/src/video/cameradevice.cpp b/src/video/cameradevice.cpp
index 23869f2c9..d9cab566a 100644
--- a/src/video/cameradevice.cpp
+++ b/src/video/cameradevice.cpp
@@ -165,6 +165,13 @@ CameraDevice* CameraDevice::open(QString devName, VideoMode mode)
         av_dict_set(&options, "video_size", QString("%1x%2").arg(mode.width).arg(mode.height).toStdString().c_str(), 0);
         av_dict_set(&options, "framerate", QString().setNum(mode.FPS).toStdString().c_str(), 0);
     }
+#endif
+#ifdef Q_OS_OSX
+    else if (iformat->name == QString("avfoundation") && mode)
+    {
+        av_dict_set(&options, "video_size", QString("%1x%2").arg(mode.width).arg(mode.height).toStdString().c_str(), 0);
+        av_dict_set(&options, "framerate", QString().setNum(mode.FPS).toStdString().c_str(), 0);
+    }
 #endif
     else if (mode)
     {
@@ -331,6 +338,10 @@ QVector<VideoMode> CameraDevice::getVideoModes(QString devName)
 #ifdef Q_OS_LINUX
     else if (iformat->name == QString("video4linux2,v4l2"))
         return v4l2::getDeviceModes(devName);
+#endif
+#ifdef Q_OS_OSX
+    else if (iformat->name == QString("avfoundation"))
+        return avfoundation::getDeviceModes(devName);
 #endif
     else
         qWarning() << "Video mode listing not implemented for input "<<iformat->name;