diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index f98a783bc72a0cef42378cdd99f1ff9c03d62385..b33cc568701e760191548e47813dc8b7999405d5 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -32,18 +32,36 @@ class EventController extends Controller
     }
 
     public function saveEvent(Request $request) {
-        $event = Event::create([
-            'name'  =>  $request->name,
-            'type'  =>  $request->type,
-            'date'  =>  $request->date,
-            'place' =>  $request->place,
-            'hours' =>  $request->hours,
-            'certificate_text' => $certificate_text
-        ]);
-        $event->save();
+        if($request->id) {
+            $event = Event::find($request->id)->update([
+                'name' => $request->name,
+                'name'  =>  $request->name,
+                'type'  =>  $request->type,
+                'date'  =>  $request->date,
+                'place' =>  $request->place,
+                'hours' =>  $request->hours,
+                'certificate_text' => $request->certificate_text
+            ]);
+        } else {
+            $event = Event::create([
+                'name'  =>  $request->name,
+                'type'  =>  $request->type,
+                'date'  =>  $request->date,
+                'place' =>  $request->place,
+                'hours' =>  $request->hours,
+                'certificate_text' => $request->certificate_text
+            ]);
+            $event->save();
+        }
         return redirect('/eventos');
     }
 
+    public function editEvent(Request $request, Event $event) {
+        return view('events.edit')->with([
+            'event' => $event
+        ]);
+    }
+
     public function eventIndex(Request $request, Event $event) {
         return view('events.event')->with([
             'event' => $event
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 5cc605a516b55898b5886d57f14352d9407fb69f..6e82a012d92250f6e9f70b009eb49c65a64ae78c 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -18,6 +18,8 @@ Route::get('/eventos', 'EventController@index'); //lista todos os eventos
 Route::get('/eventos/e/{event}', 'EventController@eventIndex'); //mostra um evento específico
 Route::get('/eventos/novo', 'EventController@newEvent'); //Formulário para novo evento
 Route::post('/eventos/novo', 'EventController@saveEvent'); //Formulário para novo evento
+Route::get('/eventos/edit/{event}', 'EventController@editEvent'); //Formulário para editar evento
+Route::post('/eventos/edit/{event}', 'EventController@saveEvent'); //Formulário para editar evento
 
 /* ----------- Rotas de Participantes ----------- */
 Route::post('/eventos/e/{event}', 'AttendeeControler@uploadAttendees'); //Faz o upload de um arquivo de participantes
diff --git a/resources/views/events/_form.blade.php b/resources/views/events/_form.blade.php
index 1864dabde9d4c14d59c775f409003b119692336f..c4dd561ff5ae624b45664f00e4dd4bdd6497eb8a 100644
--- a/resources/views/events/_form.blade.php
+++ b/resources/views/events/_form.blade.php
@@ -23,8 +23,9 @@
         </div>
         <div class="input-group">
             <span class="input-group-addon">Texto do certificado</span>
-            <input type="textarea" name="certificate_text" class="form-control" value="{{ $event->certificate_text }}">
+            <input type="textarea" name="certificate_text" class="form-control" value="{{ $event->certificateText }}">
         </div>
+        <input type="hidden" name="id" value="{{ $event->id }}">
     </fieldset>
     <button type="submit" name="button" class="btn btn-primary">Enviar</button>
     <a role="button" href="{{ url('/eventos') }}" class="btn btn-default">Cancelar</a>
diff --git a/resources/views/events/index.blade.php b/resources/views/events/index.blade.php
index fc0a0c4804a9959964a3063d9de3f0b8d8a306d1..d93b7a876115a29b1fcf1c3d15b50b965a1f6b58 100644
--- a/resources/views/events/index.blade.php
+++ b/resources/views/events/index.blade.php
@@ -22,6 +22,7 @@
                 <li class="list-group-item">
                     {{ $evt->name }} - {{$evt->date}} em {{$evt->place}}
                     <a href="{{ url('/eventos/e/'.$evt->id) }}">Ver mais</a>
+                    <a href="{{ url('/eventos/edit/'.$evt->id) }}">Editar</a>
                 </li>
                 @endforeach
                 @else